From 5757f0e20138bdb7ce6b95040988b4e3a4dc30ad Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 30 Jan 2021 18:07:12 +0000
Subject: [PATCH] Fix: Only log subproc error when it's not nil

---
 internal/dns/loop.go         | 4 +++-
 internal/openvpn/loop.go     | 4 +++-
 internal/publicip/loop.go    | 4 +++-
 internal/shadowsocks/loop.go | 4 +++-
 internal/updater/loop.go     | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/internal/dns/loop.go b/internal/dns/loop.go
index ebcc7716..f45b462a 100644
--- a/internal/dns/loop.go
+++ b/internal/dns/loop.go
@@ -70,7 +70,9 @@ func NewLooper(conf unbound.Configurator, settings settings.DNS, client *http.Cl
 }
 
 func (l *looper) logAndWait(ctx context.Context, err error) {
-	l.logger.Warn(err)
+	if err != nil {
+		l.logger.Warn(err)
+	}
 	l.logger.Info("attempting restart in %s", l.backoffTime)
 	timer := time.NewTimer(l.backoffTime)
 	l.backoffTime *= 2
diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go
index cfd9640d..8158a039 100644
--- a/internal/openvpn/loop.go
+++ b/internal/openvpn/loop.go
@@ -214,7 +214,9 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
 }
 
 func (l *looper) logAndWait(ctx context.Context, err error) {
-	l.logger.Error(err)
+	if err != nil {
+		l.logger.Error(err)
+	}
 	l.logger.Info("retrying in %s", l.backoffTime)
 	timer := time.NewTimer(l.backoffTime)
 	l.backoffTime *= 2
diff --git a/internal/publicip/loop.go b/internal/publicip/loop.go
index 0f184c65..9b637a8b 100644
--- a/internal/publicip/loop.go
+++ b/internal/publicip/loop.go
@@ -74,7 +74,9 @@ func NewLooper(client *http.Client, logger logging.Logger,
 }
 
 func (l *looper) logAndWait(ctx context.Context, err error) {
-	l.logger.Error(err)
+	if err != nil {
+		l.logger.Error(err)
+	}
 	l.logger.Info("retrying in %s", l.backoffTime)
 	timer := time.NewTimer(l.backoffTime)
 	l.backoffTime *= 2
diff --git a/internal/shadowsocks/loop.go b/internal/shadowsocks/loop.go
index 31773700..14ec209a 100644
--- a/internal/shadowsocks/loop.go
+++ b/internal/shadowsocks/loop.go
@@ -34,7 +34,9 @@ type looper struct {
 }
 
 func (l *looper) logAndWait(ctx context.Context, err error) {
-	l.logger.Error(err)
+	if err != nil {
+		l.logger.Error(err)
+	}
 	l.logger.Info("retrying in %s", l.backoffTime)
 	timer := time.NewTimer(l.backoffTime)
 	l.backoffTime *= 2
diff --git a/internal/updater/loop.go b/internal/updater/loop.go
index 0d938b81..5d57b65b 100644
--- a/internal/updater/loop.go
+++ b/internal/updater/loop.go
@@ -69,7 +69,9 @@ func NewLooper(settings settings.Updater, currentServers models.AllServers,
 }
 
 func (l *looper) logAndWait(ctx context.Context, err error) {
-	l.logger.Error(err)
+	if err != nil {
+		l.logger.Error(err)
+	}
 	l.logger.Info("retrying in %s", l.backoffTime)
 	timer := time.NewTimer(l.backoffTime)
 	l.backoffTime *= 2