Combine the two signal goroutines

fluxcd · Jan 21, 2019 · 5e5f98b · 5e5f98b
1 parent a7e4dfc
commit 5e5f98b
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/cmd/helm-operator/main.go b/cmd/helm-operator/main.go
@@ -117,9 +117,6 @@ func main() {
 		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
 
-	// error channel
-	errc := make(chan error)
-
 	// shutdown triggers
 	shutdown := make(chan struct{})
 	shutdownWg := &sync.WaitGroup{}
@@ -128,11 +125,7 @@ func main() {
 	go func() {
 		c := make(chan os.Signal, 1)
 		signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
-		errc <- fmt.Errorf("%s", <-c)
-	}()
-
-	go func() {
-		logger.Log("exiting...", <-errc)
+		logger.Log("exiting...", fmt.Errorf("%s", <-c))
 		close(shutdown)
 		shutdownWg.Wait()
 	}()