From bab50e4a4c6ddcab2197624e9148612ff2dd61c4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 23 十二月 2019 10:27:52 +0800
Subject: [PATCH] update
---
app/master/master.go | 2 +-
app/master/reaper.go | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/master/master.go b/app/master/master.go
index fa83f15..1e3cf20 100644
--- a/app/master/master.go
+++ b/app/master/master.go
@@ -60,7 +60,7 @@
}
args = append(args, app.GetParams(util.ConfigPath, file)...)
- pid, err := runProc(ctx, "./analysis", args, &cfg.Env)
+ pid, err := runProc(ctx, "./analysis", args, cfg.Env)
if err != nil {
logo.Errorf("ANALYSIS START SLAVE PROC %s IPC: %s error %+v\n", v.SdkType, v.IpcID, err)
diff --git a/app/master/reaper.go b/app/master/reaper.go
index d35a2d3..1a6d760 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,10 +47,14 @@
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
+ cmd.Env = os.Environ()
+ cmd.Env = append(cmd.Env, rEnv)
+ }
pid := -1
cmd.Stdout = os.Stdout
@@ -58,7 +62,7 @@
err := cmd.Start()
if err == nil {
pid = cmd.Process.Pid
- procMap[pid] = &procInfo{cmd, *env}
+ procMap[pid] = &procInfo{cmd, rEnv}
}
return pid, err
}
--
Gitblit v1.8.0