From ea5e8e0577d5c86c624e0f43bfc7f5874e8b719b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 23 十二月 2019 12:55:04 +0800
Subject: [PATCH] update libgowrapper
---
app/master/master.go | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/app/master/master.go b/app/master/master.go
index d4dd0a6..1e3cf20 100644
--- a/app/master/master.go
+++ b/app/master/master.go
@@ -5,7 +5,6 @@
"analysis/logo"
"analysis/util"
"context"
- "io/ioutil"
"basic.com/libgowrapper/sdkstruct.git"
)
@@ -17,36 +16,12 @@
}
// Run run
-func Run(ctx context.Context, configPath string) bool {
+func Run(ctx context.Context, configPath, soFile string) bool {
reaper(ctx)
- rPath := configPath
- configFile := configPath
- var fetcher *Fetcher
-
- fs, _ := ioutil.ReadDir(rPath)
- for _, file := range fs {
- if !file.IsDir() {
- if rPath[len(rPath)-1] != '/' {
- configFile = rPath + "/" + file.Name()
- } else {
- configFile = rPath + file.Name()
- }
-
- cfg, err := app.ReadConfig(configFile)
- if err != nil {
- logo.Errorln("Run Fetcher Master Read From File: ", configFile, " Config Error: ", err)
- continue
- }
- fetcher = NewFetcher(cfg.SoFile)
- if fetcher == nil {
- logo.Errorln("New Fetcher Load so File Funcs Error From File: ", cfg.SoFile)
- continue
- }
- }
- }
+ fetcher := NewFetcher(soFile)
if fetcher == nil {
- logo.Errorln("!!!!!!Read All So File, But Can't Init DB Fetcher")
+ logo.Errorln("New Fetcher Load so File Funcs Error From File: ", soFile)
return false
}
@@ -62,7 +37,7 @@
func manualStart(ctx context.Context, sdks []sdkstruct.SDKInfo, configPath string) bool {
rPath := configPath
- for k, v := range sdks {
+ for _, v := range sdks {
file := rPath + v.SdkType + ".json"
if rPath[len(rPath)-1] != '/' {
@@ -85,12 +60,12 @@
}
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)
}
- logo.Infof("START %d PROC %d SDK %s ID %s\n", k, pid, v.IpcID, v.SdkType)
+ logo.Infof("START SDK %s ID %s PID %d Env: %s\n", v.SdkType, v.IpcID, pid, cfg.Env)
}
return true
--
Gitblit v1.8.0