From fe75f33155ddb7bd93476cad27da51acd91a93fc Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 13 一月 2020 13:05:02 +0800
Subject: [PATCH] test helper eject msg2msgsdk
---
app/master/reaper.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/master/reaper.go b/app/master/reaper.go
index d35a2d3..529e3d0 100644
--- a/app/master/reaper.go
+++ b/app/master/reaper.go
@@ -30,7 +30,7 @@
logo.Infoln("pid : [", pid, "] quit")
}
delete(procMap, pid)
- runProc(ctxt, info.cmd.Path, info.cmd.Args[1:], &info.env)
+ runProc(ctxt, info.cmd.Path, info.cmd.Args[1:], info.env)
} else {
logo.Errorln(pid, " doesn't exist")
}
@@ -47,18 +47,25 @@
logo.Errorln(pid, " doesn't exist")
}
}
-func runProc(ctxt context.Context, bin string, args []string, env *string) (int, error) {
+func runProc(ctxt context.Context, bin string, args []string, env string) (int, error) {
cmd := exec.CommandContext(ctxt, bin, args...)
- cmd.Env = os.Environ()
- cmd.Env = append(cmd.Env, *env)
+ rEnv := ""
+ if len(env) != 0 {
+ rEnv = "LD_LIBRARY_PATH=" + env
+ logo.Infoln("Env String: ", rEnv)
+ cmd.Env = os.Environ()
+ cmd.Env = append(cmd.Env, rEnv)
+ }
pid := -1
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
+ cmd.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGTERM}
+
err := cmd.Start()
if err == nil {
pid = cmd.Process.Pid
- procMap[pid] = &procInfo{cmd, *env}
+ procMap[pid] = &procInfo{cmd, env}
}
return pid, err
}
--
Gitblit v1.8.0