From 34b4b250928b4acc52f310b9415848f36b967a82 Mon Sep 17 00:00:00 2001
From: C Cirello <ccirello@users.noreply.github.com>
Date: Thu, 13 Oct 2016 18:11:31 +0200
Subject: [PATCH] Log messages cleanup (#158)

---
 api/datastore/datastore.go | 2 +-
 api/mqs/new.go             | 2 +-
 api/runner/async_runner.go | 9 +++++----
 api/server/server.go       | 8 ++++----
 main.go                    | 8 +++++++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/api/datastore/datastore.go b/api/datastore/datastore.go
index 30d9e08a0..129c6f6e7 100644
--- a/api/datastore/datastore.go
+++ b/api/datastore/datastore.go
@@ -15,7 +15,7 @@ func New(dbURL string) (models.Datastore, error) {
 	if err != nil {
 		logrus.WithFields(logrus.Fields{"url": dbURL}).Fatal("bad DB URL")
 	}
-	logrus.WithFields(logrus.Fields{"db": u.Scheme}).Info("creating new datastore")
+	logrus.WithFields(logrus.Fields{"db": u.Scheme}).Debug("creating new datastore")
 	switch u.Scheme {
 	case "bolt":
 		return bolt.New(u)
diff --git a/api/mqs/new.go b/api/mqs/new.go
index 7ef96af92..33f16c246 100644
--- a/api/mqs/new.go
+++ b/api/mqs/new.go
@@ -15,7 +15,7 @@ func New(mqURL string) (models.MessageQueue, error) {
 	if err != nil {
 		logrus.WithError(err).WithFields(logrus.Fields{"url": mqURL}).Fatal("bad MQ URL")
 	}
-	logrus.WithFields(logrus.Fields{"mq": u.Scheme}).Info("selecting MQ")
+	logrus.WithFields(logrus.Fields{"mq": u.Scheme}).Debug("selecting MQ")
 	switch u.Scheme {
 	case "memory":
 		return NewMemoryMQ(), nil
diff --git a/api/runner/async_runner.go b/api/runner/async_runner.go
index 66dbe510e..285c1e401 100644
--- a/api/runner/async_runner.go
+++ b/api/runner/async_runner.go
@@ -128,23 +128,24 @@ func startAsyncRunners(ctx context.Context, wg *sync.WaitGroup, i int, url strin
 				time.Sleep(1 * time.Second)
 				continue
 			}
-			log.Info("Picked up task:", task.ID)
+			log.Debug("Picked up task:", task.ID)
 
-			log.Info("Running task:", task.ID)
+			log.Debug("Running task:", task.ID)
 			// Process Task
 			if _, err := runTask(task); err != nil {
 				log.WithError(err).WithFields(log.Fields{"async runner": i, "task_id": task.ID}).Error("Cannot run task")
 				continue
 			}
-			log.Info("Processed task:", task.ID)
+			log.Debug("Processed task:", task.ID)
 
 			// Delete task from queue
 			if err := deleteTask(url, task); err != nil {
 				log.WithError(err).WithFields(log.Fields{"async runner": i, "task_id": task.ID}).Error("Cannot delete task")
 				continue
 			}
+			log.Debug("Deleted task:", task.ID)
 
-			log.Info("Deleted task:", task.ID)
+			log.Info("Task complete:", task.ID)
 		}
 	}
 }
diff --git a/api/server/server.go b/api/server/server.go
index ef8e639fc..e29fef9bf 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -98,7 +98,7 @@ func (s *Server) handleTaskRequest(c *gin.Context) {
 	case "GET":
 		task, err := s.MQ.Reserve(ctx)
 		if err != nil {
-			logrus.WithError(err)
+			logrus.WithError(err).Error()
 			c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesList))
 			return
 		}
@@ -106,19 +106,19 @@ func (s *Server) handleTaskRequest(c *gin.Context) {
 	case "DELETE":
 		body, err := ioutil.ReadAll(c.Request.Body)
 		if err != nil {
-			logrus.WithError(err)
+			logrus.WithError(err).Error()
 			c.JSON(http.StatusInternalServerError, err)
 			return
 		}
 		var task models.Task
 		if err = json.Unmarshal(body, &task); err != nil {
-			logrus.WithError(err)
+			logrus.WithError(err).Error()
 			c.JSON(http.StatusInternalServerError, err)
 			return
 		}
 
 		if err := s.MQ.Delete(ctx, &task); err != nil {
-			logrus.WithError(err)
+			logrus.WithError(err).Error()
 			c.JSON(http.StatusInternalServerError, err)
 			return
 		}
diff --git a/main.go b/main.go
index 8cddba3f7..c073c8339 100644
--- a/main.go
+++ b/main.go
@@ -9,6 +9,7 @@ import (
 	"sync"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/gin-gonic/gin"
 	"github.com/iron-io/functions/api/datastore"
 	"github.com/iron-io/functions/api/mqs"
 	"github.com/iron-io/functions/api/runner"
@@ -46,6 +47,11 @@ func init() {
 		log.WithError(err).Fatalln("Invalid log level.")
 	}
 	log.SetLevel(logLevel)
+
+	gin.SetMode(gin.ReleaseMode)
+	if logLevel == log.DebugLevel {
+		gin.SetMode(gin.DebugMode)
+	}
 }
 
 func main() {
@@ -74,7 +80,7 @@ func main() {
 	}
 
 	apiURL, port, numAsync := viper.GetString(envAPIURL), viper.GetString(envPort), viper.GetInt(envNumAsync)
-	log.Info("async workers:", numAsync)
+	log.Debug("async workers:", numAsync)
 	var wgAsync sync.WaitGroup
 	if numAsync > 0 {
 		wgAsync.Add(1)