Fixes intelsdi-x#1104: skips non-executable plugins in auto_discover …

…path
tjmcs · Jul 28, 2016 · cbda3d9 · cbda3d9
1 parent 8f40854
commit cbda3d9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/control/plugin/execution.go b/control/plugin/execution.go
@@ -55,7 +55,13 @@ type commandWrapper struct {
 func (cw *commandWrapper) Path() string { return cw.cmd.Path }
 func (cw *commandWrapper) Kill() error {
 	// first, kill the process wrapped up in the commandWrapper
-	if err := cw.cmd.Process.Kill(); err != nil {
+	if cw.cmd.Process == nil {
+		err := fmt.Errorf("process for plugin '%s' not started; cannot kill", path.Base(cw.Path()))
+		log.WithFields(log.Fields{
+			"_block": "Kill",
+		}).Warn(err)
+		return err
+	} else if err := cw.cmd.Process.Kill(); err != nil {
 		log.WithFields(log.Fields{
 			"_block": "Kill",
 		}).Error(err)