From 6fa3dbf51db482430271979840734859200bf392 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 20 一月 2020 11:43:09 +0800
Subject: [PATCH] bug fixed reid.go runcommunication parameter
---
app/master/reaper.go | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app/master/reaper.go b/app/master/reaper.go
index 1a6d760..1c48d59 100644
--- a/app/master/reaper.go
+++ b/app/master/reaper.go
@@ -51,18 +51,27 @@
cmd := exec.CommandContext(ctxt, bin, args...)
rEnv := ""
if len(env) != 0 {
- rEnv = "LD_LIBRARY_PATH=" + env
+ runtime := "LD_LIBRARY_PATH"
+ rEnv = runtime + "=" + env
+ logo.Infoln("Env String: ", rEnv)
+
+ // remove os environ ld
+ old := os.Getenv(runtime)
+ os.Unsetenv(runtime)
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, rEnv)
+ os.Setenv(runtime, old)
}
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, rEnv}
+ procMap[pid] = &procInfo{cmd, env}
}
return pid, err
}
--
Gitblit v1.8.0