Merge pull request #502 from vania-pooh/master

Waiting for driver process to stop on Windows (fixes #499)
aerokube · Jul 22, 2018 · d4ce26a · d4ce26a
2 parents eea374a + 7472d94
commit d4ce26a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/service/driver.go b/service/driver.go
@@ -88,7 +88,7 @@ func (d *Driver) stopProcess(cmd *exec.Cmd) {
 		log.Printf("[%d] [FAILED_TO_TERMINATE_PROCESS] [%d] [%v]", d.RequestId, cmd.Process.Pid, err)
 		return
 	}
-	if d.CaptureDriverLogs && d.LogOutputDir != "" {
+	if !d.CaptureDriverLogs && d.LogOutputDir != "" {
 		cmd.Stdout.(*os.File).Close()
 	}
 	log.Printf("[%d] [TERMINATED_PROCESS] [%d] [%.2fs]", d.RequestId, cmd.Process.Pid, util.SecondsSince(s))

diff --git a/service/driver_windows.go b/service/driver_windows.go
@@ -7,5 +7,7 @@ import (
 )
 
 func stopProc(cmd *exec.Cmd) error {
-	return cmd.Process.Kill()
+	error := cmd.Process.Kill()
+	cmd.Wait()
+	return error
 }