@@ -168,11 +168,8 @@ func makeFullNode(ctx *cli.Context) *node.Node {
168
168
log .Info ("makeFullNode" , "storageEnabled" , storageEnabled )
169
169
utils .RegisterStorageService (stack , & cfg .TorrentFs , gitCommit )
170
170
}
171
- var wg sync.WaitGroup
172
171
if deviceType := utils .IsCVMIPC (ctx .GlobalString (utils .InferDeviceTypeFlag .Name )); deviceType != "" {
173
- wg .Add (1 )
174
172
go func () {
175
- defer wg .Done ()
176
173
cmd := os .Args [0 ]
177
174
log .Info ("RegisterCVMService" , "cmd" , cmd )
178
175
args := []string {"cvm" ,
@@ -198,30 +195,29 @@ func makeFullNode(ctx *cli.Context) *node.Node {
198
195
if err := prg .Start (); err != nil {
199
196
panic (err )
200
197
}
198
+ log .Info ("Cvm service register success" , "config" , cfg )
201
199
run_result := prg .Start ()
202
200
var wg sync.WaitGroup
203
- wg .Add (2 )
201
+ wg .Add (1 )
204
202
go func () {
205
203
defer wg .Done ()
206
204
_ , _ = io .Copy (stdout , stdoutIn )
207
205
}()
206
+ wg .Add (1 )
208
207
go func () {
209
208
defer wg .Done ()
210
209
_ , _ = io .Copy (stderr , stderrIn )
211
210
}()
212
- //wg.Wait()
213
-
211
+ wg .Wait ()
214
212
if err := prg .Wait (); err != nil {
215
213
log .Error ("RegisterCVMService" , "err" , err )
216
214
}
217
215
log .Debug ("RegisterCVMService" , "deviceType" , deviceType , "Exited" , run_result )
218
216
// outStr, errStr := string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())
219
217
// log.Debug("RegisterCVMService", "out", outStr, "err", errStr)
220
218
}()
221
- wg .Wait ()
222
- //time.Sleep(10000 * time.Millisecond)
223
219
}
224
- wg . Wait ()
220
+
225
221
utils .RegisterCortexService (stack , & cfg .Cortex )
226
222
227
223
// if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) {
0 commit comments