From 929a6fb654a41a57c3ef2a13f1620f7a91e55f77 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Thu, 4 Jul 2019 15:50:37 +0200
Subject: [PATCH] service/*: log error only if nil

---
 internal/services/configstore/configstore.go | 15 ++++++++++-----
 internal/services/executor/executor.go       |  9 ++++++---
 internal/services/gateway/gateway.go         |  9 ++++++---
 internal/services/gitserver/main.go          |  9 ++++++---
 internal/services/runservice/runservice.go   | 15 ++++++++++-----
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/internal/services/configstore/configstore.go b/internal/services/configstore/configstore.go
index 48a9a77..7174859 100644
--- a/internal/services/configstore/configstore.go
+++ b/internal/services/configstore/configstore.go
@@ -255,12 +255,17 @@ func (s *Configstore) Run(ctx context.Context) error {
 	case <-ctx.Done():
 		log.Infof("configstore exiting")
 		httpServer.Close()
-		return nil
 	case err := <-lerrCh:
-		log.Errorf("http server listen error: %+v", err)
-		return err
+		if err != nil {
+			log.Errorf("http server listen error: %+v", err)
+			return err
+		}
 	case err := <-errCh:
-		log.Errorf("error: %+v", err)
-		return err
+		if err != nil {
+			log.Errorf("error: %+v", err)
+			return err
+		}
 	}
+
+	return nil
 }
diff --git a/internal/services/executor/executor.go b/internal/services/executor/executor.go
index 71eda73..571f579 100644
--- a/internal/services/executor/executor.go
+++ b/internal/services/executor/executor.go
@@ -1429,9 +1429,12 @@ func (e *Executor) Run(ctx context.Context) error {
 	case <-ctx.Done():
 		log.Infof("runservice executor exiting")
 		httpServer.Close()
-		return nil
 	case err := <-lerrCh:
-		log.Errorf("http server listen error: %v", err)
-		return err
+		if err != nil {
+			log.Errorf("http server listen error: %v", err)
+			return err
+		}
 	}
+
+	return nil
 }
diff --git a/internal/services/gateway/gateway.go b/internal/services/gateway/gateway.go
index efbd24c..67ce07a 100644
--- a/internal/services/gateway/gateway.go
+++ b/internal/services/gateway/gateway.go
@@ -333,9 +333,12 @@ func (g *Gateway) Run(ctx context.Context) error {
 	case <-ctx.Done():
 		log.Infof("configstore exiting")
 		httpServer.Close()
-		return nil
 	case err := <-lerrCh:
-		log.Errorf("http server listen error: %v", err)
-		return err
+		if err != nil {
+			log.Errorf("http server listen error: %v", err)
+			return err
+		}
 	}
+
+	return nil
 }
diff --git a/internal/services/gitserver/main.go b/internal/services/gitserver/main.go
index 9083bf3..9e99c61 100644
--- a/internal/services/gitserver/main.go
+++ b/internal/services/gitserver/main.go
@@ -175,9 +175,12 @@ func (s *Gitserver) Run(ctx context.Context) error {
 	case <-ctx.Done():
 		log.Infof("gitserver exiting")
 		httpServer.Close()
-		return nil
 	case err := <-lerrCh:
-		log.Errorf("http server listen error: %v", err)
-		return err
+		if err != nil {
+			log.Errorf("http server listen error: %v", err)
+			return err
+		}
 	}
+
+	return nil
 }
diff --git a/internal/services/runservice/runservice.go b/internal/services/runservice/runservice.go
index 2045f1e..9bdae35 100644
--- a/internal/services/runservice/runservice.go
+++ b/internal/services/runservice/runservice.go
@@ -258,12 +258,17 @@ func (s *Runservice) Run(ctx context.Context) error {
 	case <-ctx.Done():
 		log.Infof("runservice scheduler exiting")
 		httpServer.Close()
-		return nil
 	case err := <-lerrCh:
-		log.Errorf("http server listen error: %v", err)
-		return err
+		if err != nil {
+			log.Errorf("http server listen error: %v", err)
+			return err
+		}
 	case err := <-errCh:
-		log.Errorf("error: %+v", err)
-		return err
+		if err != nil {
+			log.Errorf("error: %+v", err)
+			return err
+		}
 	}
+
+	return nil
 }