Merge pull request #52 from mysteriumnetwork/feature/wait-for-exit

CmdWrapper.Stop() blocks until command fully exits
mysteriumnetwork · Mar 2, 2020 · 9a181e8 · 9a181e8
2 parents a4ebc12 + 5f7c782
commit 9a181e8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/openvpn/cmd_wrapper.go b/openvpn/cmd_wrapper.go
@@ -120,6 +120,7 @@ func (cw *CmdWrapper) outputToLog(output io.ReadCloser, streamPrefix string) {
 func (cw *CmdWrapper) waitForExit(cmd *exec.Cmd) {
 	err := cmd.Wait()
 	cw.CmdExitError <- err
+	close(cw.CmdExitError)
 }
 
 func (cw *CmdWrapper) waitForShutdown(cmd *exec.Cmd) {
@@ -129,4 +130,7 @@ func (cw *CmdWrapper) waitForShutdown(cmd *exec.Cmd) {
 	if err := cmd.Process.Signal(exitSignal); err != nil {
 		log.Error(cw.logPrefix, "Error killing cw:", err)
 	}
+
+	// Wait for command to quit
+	<-cw.CmdExitError
 }