From a2b0eabb4113e70fdd34d46416e7da4822a8d4a7 Mon Sep 17 00:00:00 2001
From: Philipp Mieden <dreadl0ck@protonmail.ch>
Date: Wed, 29 May 2019 15:17:47 +0200
Subject: [PATCH] logging: set console encoding explicitely if LOG_JSON env var
 is not set

---
 logger/log.go | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/logger/log.go b/logger/log.go
index df0d920..e5a7b3f 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -17,22 +17,26 @@ var (
 // SetupLogging configures the logger
 func SetupLogging(debug bool, outputPath string) {
 
-	var err error
+	var (
+		zc  zap.Config
+		err error
+	)
+
 	if debug {
-		zc := zap.NewDevelopmentConfig()
-		if os.Getenv("LOG_JSON") == "1" {
-			zc.Encoding = "json"
-		}
+		zc = zap.NewDevelopmentConfig()
 		zc.OutputPaths = append(zc.OutputPaths, outputPath)
-		Log, err = zc.Build()
 	} else {
-		zc := zap.NewProductionConfig()
-		if os.Getenv("LOG_JSON") == "1" {
-			zc.Encoding = "json"
-		}
+		zc = zap.NewProductionConfig()
 		zc.OutputPaths = append(zc.OutputPaths, outputPath)
-		Log, err = zc.Build()
 	}
+
+	if os.Getenv("LOG_JSON") == "1" {
+		zc.Encoding = "json"
+	} else {
+		zc.Encoding = "console"
+	}
+
+	Log, err = zc.Build()
 	if err != nil {
 		log.Fatalf("can't initialize zap logger: %v", err)
 	}