When a discovery is quitted ensure that the process gets Wait-ed

Otherwise the resources allocated by the process will be leaked.
(pipes, zombie process, etc.)

Author: cmaglie

arduino/discovery/discovery.go

@@ -268,8 +268,15 @@ func (disc *PluggableDiscovery) killProcess() error {
 	if err := disc.process.Kill(); err != nil {
 		return err
 	}
+	if err := disc.process.Wait(); err != nil {
+		return err
+	}
 	disc.statusMutex.Lock()
 	defer disc.statusMutex.Unlock()
+	if disc.eventChan != nil {
+		close(disc.eventChan)
+		disc.eventChan = nil
+	}
 	disc.state = Dead
 	logrus.Infof("killed discovery %s process", disc.id)
 	return nil
@@ -371,13 +378,7 @@ func (disc *PluggableDiscovery) Quit() error {
 	} else if msg.Message != "OK" || msg.Error {
 		return errors.Errorf(tr("command failed: %s"), msg.Message)
 	}
-	disc.statusMutex.Lock()
-	defer disc.statusMutex.Unlock()
-	if disc.eventChan != nil {
-		close(disc.eventChan)
-		disc.eventChan = nil
-	}
-	disc.state = Dead
+	disc.killProcess()
 	return nil
 }
 

arduino/discovery/discoverymanager/discoverymanager.go

@@ -120,7 +120,7 @@ func (dm *DiscoveryManager) RunAll() []error {
 func (dm *DiscoveryManager) StartAll() []error {
 	return dm.parallelize(func(d *discovery.PluggableDiscovery) error {
 		state := d.State()
-		if state != discovery.Idling || state == discovery.Running {
+		if state != discovery.Idling {
 			// Already started
 			return nil
 		}