First stab in the dark at context cleanup

1 files changed, 12 insertions, 1 deletions

diff --git a/internal/helper/command_wrapper_go1.6.go b/internal/helper/command_wrapper_go1.6.go
index 71cef0ac8..e7d83e4d1 100644
--- a/internal/helper/command_wrapper_go1.6.go
+++ b/internal/helper/command_wrapper_go1.6.go
@@ -3,6 +3,7 @@
 package helper
 
 import (
+	"log"
 	"os/exec"
 
 	"golang.org/x/net/context"
@@ -10,5 +11,15 @@ import (
 
 // CommandWrapper handles context until we compile using Go 1.7
 func CommandWrapper(ctx context.Context, name string, arg ...string) *exec.Cmd {
-	return exec.Command(name, arg...)
+	command := exec.Command(name, arg...)
+
+	if ctx != nil {
+		go func() {
+			<-ctx.Done()
+			log.Printf("Context done, killing process")
+			command.Kill()
+		}()
+	}
+
+	return command
 }