beter cleanup

GoogleContainerTools · Mar 20, 2019 · 61e6257 · 61e6257
1 parent c73e2f5
commit 61e6257
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/cmd/skaffold/app/cmd/build.go b/cmd/skaffold/app/cmd/build.go
@@ -76,9 +76,9 @@ func runBuild(out io.Writer) error {
 		buildOut = ioutil.Discard
 	}
 
-	bRes, err := createRunnerAndBuildFunc(buildOut)
-
-	if err != nil {
+	bRes, cleanUp, err := createRunnerAndBuildFunc(buildOut)
+	defer cleanUp()
+	if err == nil {
 		return err
 	}
 
@@ -92,9 +92,8 @@ func runBuild(out io.Writer) error {
 	return nil
 }
 
-func createRunnerAndBuild(buildOut io.Writer) ([]build.Artifact, error) {
+func createRunnerAndBuild(buildOut io.Writer) ([]build.Artifact, func(), error) {
 	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
 	catchCtrlC(cancel)
 
 	runner, config, err := newRunner(opts)
@@ -105,8 +104,13 @@ func createRunnerAndBuild(buildOut io.Writer) ([]build.Artifact, error) {
 		}
 	}
 	if err != nil {
-		return nil, errors.Wrap(err, "creating runner")
+		return nil, func() { cancel() }, errors.Wrap(err, "creating runner")
+	}
+
+	cleanUp := func() {
+		cancel()
+		runner.RPCServerShutdown()
 	}
-	defer runner.RPCServerShutdown()
-	return runner.BuildAndTest(ctx, buildOut, targetArtifacts)
+	a, err := runner.BuildAndTest(ctx, buildOut, targetArtifacts)
+	return a, cleanUp, err
 }