File tree 1 file changed +10
-7
lines changed
1 file changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -247,29 +247,32 @@ func (disc *PluggableDiscovery) runProcess() error {
247
247
return err
248
248
}
249
249
disc .outgoingCommandsPipe = stdin
250
- disc .process = proc
251
250
252
251
messageChan := make (chan * discoveryMessage )
253
252
disc .incomingMessagesChan = messageChan
254
253
go disc .jsonDecodeLoop (stdout , messageChan )
255
254
256
- if err := disc . process .Start (); err != nil {
255
+ if err := proc .Start (); err != nil {
257
256
return err
258
257
}
258
+
259
259
disc .statusMutex .Lock ()
260
260
defer disc .statusMutex .Unlock ()
261
+ disc .process = proc
261
262
disc .state = Alive
262
263
logrus .Infof ("started discovery %s process" , disc .id )
263
264
return nil
264
265
}
265
266
266
267
func (disc * PluggableDiscovery ) killProcess () error {
267
268
logrus .Infof ("killing discovery %s process" , disc .id )
268
- if err := disc .process .Kill (); err != nil {
269
- return err
270
- }
271
- if err := disc .process .Wait (); err != nil {
272
- return err
269
+ if disc .process != nil {
270
+ if err := disc .process .Kill (); err != nil {
271
+ return err
272
+ }
273
+ if err := disc .process .Wait (); err != nil {
274
+ return err
275
+ }
273
276
}
274
277
disc .statusMutex .Lock ()
275
278
defer disc .statusMutex .Unlock ()
You can’t perform that action at this time.
0 commit comments