Allow to change log level for server. (#346)

Add possobility to change output verbosity via environment varaible
`LOG_LEVEL`. There are several values: panic, fatal, error, warn or
warning, info, debug and trace.
By default `info` is used.

Co-authored-by: Pete Wagner <[email protected]>
Co-authored-by: Sergey Fedorov <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -7,6 +7,7 @@
 * fix: The release-test task is always success.
   add: Allow to run release-test on arm machines. (#340, @miry)
 * Upgrade `goreleaser`. Support `armv7` and `armv6` oses. (#339, @mitchellrj)
+* Allow to change log level for server. (#346, @miry)
 
 # [2.2.0]
 

Dockerfile

@@ -4,5 +4,7 @@ EXPOSE 8474
 ENTRYPOINT ["/toxiproxy"]
 CMD ["-host=0.0.0.0"]
 
+ENV LOG_LEVEL=info
+
 COPY toxiproxy-server-linux-* /toxiproxy
 COPY toxiproxy-cli-linux-* /toxiproxy-cli

README.md

@@ -49,6 +49,7 @@ stopping you from creating a client in any other language (see
       1. [Upgrading from 1.x](#upgrading-from-toxiproxy-1x)
    2. [Populating](#2-populating-toxiproxy)
    3. [Using](#3-using-toxiproxy)
+   4. [Logging](#4-logging)
 5. [Toxics](#toxics)
    1. [Latency](#latency)
    2. [Down](#down)
@@ -360,6 +361,11 @@ toxiproxy-cli toxic add -t latency -a latency=1000 shopify_test_redis_master
 
 Please consult your respective client library on usage.
 
+### 4. Logging
+
+There are the following log levels: panic, fatal, error, warn or warning, info, debug and trace.
+The level could be updated via environment variable `LOG_LEVEL`.
+
 ### Toxics
 
 Toxics manipulate the pipe between the client and upstream. They can be added

api.go

@@ -31,19 +31,20 @@ func (server *ApiServer) PopulateConfig(filename string) {
 			"config": filename,
 			"error":  err,
 		}).Error("Error reading config file")
+		return
+	}
+
+	proxies, err := server.Collection.PopulateJson(file)
+	if err != nil {
+		logrus.WithFields(logrus.Fields{
+			"config": filename,
+			"error":  err,
+		}).Error("Failed to populate proxies from file")
 	} else {
-		proxies, err := server.Collection.PopulateJson(file)
-		if err != nil {
-			logrus.WithFields(logrus.Fields{
-				"config": filename,
-				"error":  err,
-			}).Error("Failed to populate proxies from file")
-		} else {
-			logrus.WithFields(logrus.Fields{
-				"config":  filename,
-				"proxies": len(proxies),
-			}).Info("Populated proxies from file")
-		}
+		logrus.WithFields(logrus.Fields{
+			"config":  filename,
+			"proxies": len(proxies),
+		}).Info("Populated proxies from file")
 	}
 }
 

bin/e2e

@@ -22,7 +22,7 @@ go run testing/endpoint.go 2>&1 | sed -e 's/^/[web] /' &
 
 echo "=== Starting Toxiproxy"
 
-./dist/toxiproxy-server  2>&1 | sed -e 's/^/[toxiproxy] /' &
+LOG_LEVEL=debug ./dist/toxiproxy-server  2>&1 | sed -e 's/^/[toxiproxy] /' &
 
 echo "=== Wait when service are available"
 

cmd/cli/cli.go

@@ -7,10 +7,11 @@ import (
 	"strconv"
 	"strings"
 
-	toxiproxyServer "github.com/Shopify/toxiproxy/v2"
-	toxiproxy "github.com/Shopify/toxiproxy/v2/client"
 	"github.com/urfave/cli/v2"
 	terminal "golang.org/x/term"
+
+	toxiproxyServer "github.com/Shopify/toxiproxy/v2"
+	toxiproxy "github.com/Shopify/toxiproxy/v2/client"
 )
 
 const (

cmd/server/server.go

@@ -5,9 +5,12 @@ import (
 	"math/rand"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/Shopify/toxiproxy/v2"
 )
 
@@ -27,6 +30,8 @@ func init() {
 }
 
 func main() {
+	setupLogger()
+
 	server := toxiproxy.NewServer()
 	if len(config) > 0 {
 		server.PopulateConfig(config)
@@ -42,3 +47,24 @@ func main() {
 
 	server.Listen(host, port)
 }
+
+func setupLogger() {
+	val, ok := os.LookupEnv("LOG_LEVEL")
+	if !ok {
+		return
+	}
+
+	lvl, err := logrus.ParseLevel(val)
+	if err == nil {
+		logrus.SetLevel(lvl)
+		return
+	}
+
+	valid_levels := make([]string, len(logrus.AllLevels))
+	for i, level := range logrus.AllLevels {
+		valid_levels[i] = level.String()
+	}
+	levels := strings.Join(valid_levels, ",")
+
+	logrus.Errorf("unknown LOG_LEVEL value: \"%s\", use one of: %s", val, levels)
+}