From 93110dc6da37a1ed7c85b4aeb1456b7cd2106dae Mon Sep 17 00:00:00 2001
From: Filip <filip.haftek@airhelp.com>
Date: Fri, 29 Sep 2017 09:38:33 +0200
Subject: [PATCH] Simpliefied logging + restored json formatter

---
 lambda/forwarder.go      |  2 +-
 mapping/mapping.go       |  2 +-
 rabbitmq/consumer.go     | 12 ++++--------
 server.go                |  8 +++-----
 sns/forwarder.go         |  2 +-
 sqs/forwarder.go         |  2 +-
 supervisor/supervisor.go |  3 +--
 7 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/lambda/forwarder.go b/lambda/forwarder.go
index 674b856..c7dd3f7 100644
--- a/lambda/forwarder.go
+++ b/lambda/forwarder.go
@@ -32,7 +32,7 @@ func CreateForwarder(entry config.AmazonEntry, lambdaClient ...lambdaiface.Lambd
 		client = lambda.New(session.Must(session.NewSession()))
 	}
 	forwarder := Forwarder{entry.Name, client, entry.Target}
-	log.WithFields(log.Fields{"forwarderName": forwarder.Name()}).Info("Created forwarder")
+	log.WithField("forwarderName", forwarder.Name()).Info("Created forwarder")
 	return forwarder
 }
 
diff --git a/mapping/mapping.go b/mapping/mapping.go
index 3d8173c..307c554 100644
--- a/mapping/mapping.go
+++ b/mapping/mapping.go
@@ -67,7 +67,7 @@ func (c Client) Load() (map[consumer.Client]forwarder.Client, error) {
 
 func (c Client) loadFile() ([]byte, error) {
 	filePath := os.Getenv(config.MappingFile)
-	log.WithFields(log.Fields{"mappingFile": filePath}).Info("Loading mapping file")
+	log.WithField("mappingFile", filePath).Info("Loading mapping file")
 	return ioutil.ReadFile(filePath)
 }
 
diff --git a/rabbitmq/consumer.go b/rabbitmq/consumer.go
index 5e07630..87e654a 100644
--- a/rabbitmq/consumer.go
+++ b/rabbitmq/consumer.go
@@ -75,14 +75,12 @@ func closeRabbitMQ(conn *amqp.Connection, ch *amqp.Channel) {
 	log.Info("Closing RabbitMQ connection and channel")
 	if ch != nil {
 		if err := ch.Close(); err != nil {
-			log.WithFields(log.Fields{
-				"error": err.Error()}).Error("Could not close channel")
+			log.WithField("error", err.Error()).Error("Could not close channel")
 		}
 	}
 	if conn != nil {
 		if err := conn.Close(); err != nil {
-			log.WithFields(log.Fields{
-				"error": err.Error()}).Error("Could not close connection")
+			log.WithField("error", err.Error()).Error("Could not close connection")
 		}
 	}
 }
@@ -180,11 +178,9 @@ func (c Consumer) startForwarding(params *workerParams) error {
 				}
 			}
 		case <-params.check:
-			log.WithFields(log.Fields{
-				"forwarderName": forwarderName}).Info("Checking")
+			log.WithField("forwarderName", forwarderName).Info("Checking")
 		case <-params.stop:
-			log.WithFields(log.Fields{
-				"forwarderName": forwarderName}).Info("Closing")
+			log.WithField("forwarderName", forwarderName).Info("Closing")
 			closeRabbitMQ(params.conn, params.ch)
 			return errors.New(closedBySupervisorMessage)
 		}
diff --git a/server.go b/server.go
index 820fff6..e0db26e 100644
--- a/server.go
+++ b/server.go
@@ -9,18 +9,16 @@ import (
 )
 
 func main() {
-	log.SetFormatter(&log.TextFormatter{})
+	log.SetFormatter(&log.JSONFormatter{})
 	log.SetOutput(os.Stdout)
 
 	consumerForwarderMap, err := mapping.New().Load()
 	if err != nil {
-		log.WithFields(log.Fields{
-			"error": err.Error()}).Fatalf("Could not load consumer - forwarder pairs. Error: " + err.Error())
+		log.WithField("error", err.Error()).Fatalf("Could not load consumer - forwarder pairs")
 	}
 	supervisor := supervisor.New(consumerForwarderMap)
 	if err := supervisor.Start(); err != nil {
-		log.WithFields(log.Fields{
-			"error": err.Error()}).Fatal("Could not start supervisor")
+		log.WithField("error", err.Error()).Fatal("Could not start supervisor")
 	}
 	http.HandleFunc("/restart", supervisor.Restart)
 	http.HandleFunc("/health", supervisor.Check)
diff --git a/sns/forwarder.go b/sns/forwarder.go
index 7034bdb..89e834d 100644
--- a/sns/forwarder.go
+++ b/sns/forwarder.go
@@ -33,7 +33,7 @@ func CreateForwarder(entry config.AmazonEntry, snsClient ...snsiface.SNSAPI) for
 		client = sns.New(session.Must(session.NewSession()))
 	}
 	forwarder := Forwarder{entry.Name, client, entry.Target}
-	log.WithFields(log.Fields{"forwarderName": forwarder.Name()}).Info("Created forwarder")
+	log.WithField("forwarderName", forwarder.Name()).Info("Created forwarder")
 	return forwarder
 }
 
diff --git a/sqs/forwarder.go b/sqs/forwarder.go
index 70d0a9f..7d65165 100644
--- a/sqs/forwarder.go
+++ b/sqs/forwarder.go
@@ -33,7 +33,7 @@ func CreateForwarder(entry config.AmazonEntry, sqsClient ...sqsiface.SQSAPI) for
 		client = sqs.New(session.Must(session.NewSession()))
 	}
 	forwarder := Forwarder{entry.Name, client, entry.Target}
-	log.WithFields(log.Fields{"forwarderName": forwarder.Name()}).Info("Created forwarder")
+	log.WithField("forwarderName", forwarder.Name()).Info("Created forwarder")
 	return forwarder
 }
 
diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go
index c118ceb..e8b270b 100644
--- a/supervisor/supervisor.go
+++ b/supervisor/supervisor.go
@@ -62,8 +62,7 @@ func (c *Client) Check(w http.ResponseWriter, r *http.Request) {
 	if accept := r.Header.Get(acceptHeader); accept != "" &&
 		!strings.Contains(accept, jsonType) &&
 		!strings.Contains(accept, acceptAll) {
-		log.WithFields(log.Fields{
-			"acceptHeader": accept}).Warn("Wrong Accept header")
+		log.WithField("acceptHeader", accept).Warn("Wrong Accept header")
 		notAcceptableResponse(w)
 		return
 	}