mirror of
https://github.com/lzh-1625/go_process_manager.git
synced 2025-10-05 16:06:51 +08:00
rename
This commit is contained in:
@@ -33,7 +33,7 @@ type Process interface {
|
|||||||
|
|
||||||
type ProcessBase struct {
|
type ProcessBase struct {
|
||||||
Process
|
Process
|
||||||
p *os.Process
|
op *os.Process
|
||||||
Name string
|
Name string
|
||||||
Pid int
|
Pid int
|
||||||
StartCommand []string
|
StartCommand []string
|
||||||
@@ -84,7 +84,7 @@ type ConnectInstance interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProcessBase) watchDog() {
|
func (p *ProcessBase) watchDog() {
|
||||||
state, _ := p.p.Wait()
|
state, _ := p.op.Wait()
|
||||||
if p.cgroup.enable && p.cgroup.delete != nil {
|
if p.cgroup.enable && p.cgroup.delete != nil {
|
||||||
err := p.cgroup.delete()
|
err := p.cgroup.delete()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -128,7 +128,7 @@ func (p *ProcessBase) pInit() {
|
|||||||
p.State.manualStopFlag = false
|
p.State.manualStopFlag = false
|
||||||
p.State.startTime = time.Now()
|
p.State.startTime = time.Now()
|
||||||
p.ws = make(map[string]ConnectInstance)
|
p.ws = make(map[string]ConnectInstance)
|
||||||
p.Pid = p.p.Pid
|
p.Pid = p.op.Pid
|
||||||
p.doOnInit()
|
p.doOnInit()
|
||||||
p.InitPerformanceStatus()
|
p.InitPerformanceStatus()
|
||||||
p.initPsutil()
|
p.initPsutil()
|
||||||
@@ -306,7 +306,7 @@ func (p *ProcessBase) initPsutil() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProcessBase) Kill() error {
|
func (p *ProcessBase) Kill() error {
|
||||||
p.p.Signal(syscall.SIGINT)
|
p.op.Signal(syscall.SIGINT)
|
||||||
select {
|
select {
|
||||||
case <-p.StopChan:
|
case <-p.StopChan:
|
||||||
{
|
{
|
||||||
@@ -315,7 +315,7 @@ func (p *ProcessBase) Kill() error {
|
|||||||
case <-time.After(time.Second * time.Duration(config.CF.KillWaitTime)):
|
case <-time.After(time.Second * time.Duration(config.CF.KillWaitTime)):
|
||||||
{
|
{
|
||||||
log.Logger.Debugw("进程kill超时,强制停止进程", "name", p.Name)
|
log.Logger.Debugw("进程kill超时,强制停止进程", "name", p.Name)
|
||||||
return p.p.Kill()
|
return p.op.Kill()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -56,7 +56,7 @@ func (p *ProcessPty) Start() (err error) {
|
|||||||
})
|
})
|
||||||
p.pty = pf
|
p.pty = pf
|
||||||
log.Logger.Infow("进程启动成功", "进程名称", p.Name, "重启次数", p.State.restartTimes)
|
log.Logger.Infow("进程启动成功", "进程名称", p.Name, "重启次数", p.State.restartTimes)
|
||||||
p.p = cmd.Process
|
p.op = cmd.Process
|
||||||
p.pInit()
|
p.pInit()
|
||||||
p.push("进程启动成功")
|
p.push("进程启动成功")
|
||||||
return nil
|
return nil
|
||||||
|
@@ -70,7 +70,7 @@ func (p *ProcessStd) Start() (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log.Logger.Infow("进程启动成功", "重启次数", p.State.restartTimes)
|
log.Logger.Infow("进程启动成功", "重启次数", p.State.restartTimes)
|
||||||
p.p = cmd.Process
|
p.op = cmd.Process
|
||||||
p.pInit()
|
p.pInit()
|
||||||
p.push("进程启动成功")
|
p.push("进程启动成功")
|
||||||
return nil
|
return nil
|
||||||
|
Reference in New Issue
Block a user