From a1ab6978483021abf986dc0cadf7950dbc1b3912 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Mon, 7 Jul 2025 09:15:36 +0800 Subject: [PATCH] rename --- internal/app/logic/process_base.go | 10 +++++----- internal/app/logic/process_pty_linux.go | 2 +- internal/app/logic/process_std.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/app/logic/process_base.go b/internal/app/logic/process_base.go index 4e9de28..12f1c6e 100644 --- a/internal/app/logic/process_base.go +++ b/internal/app/logic/process_base.go @@ -33,7 +33,7 @@ type Process interface { type ProcessBase struct { Process - p *os.Process + op *os.Process Name string Pid int StartCommand []string @@ -84,7 +84,7 @@ type ConnectInstance interface { } func (p *ProcessBase) watchDog() { - state, _ := p.p.Wait() + state, _ := p.op.Wait() if p.cgroup.enable && p.cgroup.delete != nil { err := p.cgroup.delete() if err != nil { @@ -128,7 +128,7 @@ func (p *ProcessBase) pInit() { p.State.manualStopFlag = false p.State.startTime = time.Now() p.ws = make(map[string]ConnectInstance) - p.Pid = p.p.Pid + p.Pid = p.op.Pid p.doOnInit() p.InitPerformanceStatus() p.initPsutil() @@ -306,7 +306,7 @@ func (p *ProcessBase) initPsutil() { } func (p *ProcessBase) Kill() error { - p.p.Signal(syscall.SIGINT) + p.op.Signal(syscall.SIGINT) select { case <-p.StopChan: { @@ -315,7 +315,7 @@ func (p *ProcessBase) Kill() error { case <-time.After(time.Second * time.Duration(config.CF.KillWaitTime)): { log.Logger.Debugw("进程kill超时,强制停止进程", "name", p.Name) - return p.p.Kill() + return p.op.Kill() } } } diff --git a/internal/app/logic/process_pty_linux.go b/internal/app/logic/process_pty_linux.go index f6d4de1..feb2775 100644 --- a/internal/app/logic/process_pty_linux.go +++ b/internal/app/logic/process_pty_linux.go @@ -56,7 +56,7 @@ func (p *ProcessPty) Start() (err error) { }) p.pty = pf log.Logger.Infow("进程启动成功", "进程名称", p.Name, "重启次数", p.State.restartTimes) - p.p = cmd.Process + p.op = cmd.Process p.pInit() p.push("进程启动成功") return nil diff --git a/internal/app/logic/process_std.go b/internal/app/logic/process_std.go index 38a0847..9aac54c 100644 --- a/internal/app/logic/process_std.go +++ b/internal/app/logic/process_std.go @@ -70,7 +70,7 @@ func (p *ProcessStd) Start() (err error) { return err } log.Logger.Infow("进程启动成功", "重启次数", p.State.restartTimes) - p.p = cmd.Process + p.op = cmd.Process p.pInit() p.push("进程启动成功") return nil