Review comments

weaveworks · Feb 5, 2016 · 5ec4e53 · 5ec4e53
1 parent 8b8a332
commit 5ec4e53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -89,8 +89,8 @@ while true; do
             APP_ARGS="$APP_ARGS -$ARG_NAME=$ARG_VALUE"
             ;;
 	--debug)
-            APP_ARGS="$APP_ARGS -log-level=debug"
-	    PROBE_ARGS="$PROBE_ARGS -log-level=debug"
+            APP_ARGS="$APP_ARGS -log.level=debug"
+	    PROBE_ARGS="$PROBE_ARGS -log.level=debug"
             ;;
         --no-app)
             touch /etc/service/app/down

diff --git a/prog/app.go b/prog/app.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"strconv"
-	"strings"
 	"time"
 
 	log "github.com/Sirupsen/logrus"
@@ -32,16 +31,12 @@ func appMain() {
 	var (
 		window    = flag.Duration("window", 15*time.Second, "window")
 		listen    = flag.String("http.address", ":"+strconv.Itoa(xfer.AppPort), "webserver listen address")
-		logLevel  = flag.String("log-level", "info", "logging threshold level: debug|info|warn|error|fatal|panic")
+		logLevel  = flag.String("log.level", "info", "logging threshold level: debug|info|warn|error|fatal|panic")
 		logPrefix = flag.String("log.prefix", "<app>", "prefix for each log line")
 	)
 	flag.Parse()
 
 	setLogLevel(*logLevel)
-
-	if !strings.HasSuffix(*logPrefix, " ") {
-		*logPrefix += " "
-	}
 	setLogFormatter(*logPrefix)
 
 	defer log.Info("app exiting")

diff --git a/prog/main.go b/prog/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	log "github.com/Sirupsen/logrus"
 	weavecommon "github.com/weaveworks/weave/common"
@@ -24,6 +25,9 @@ func (f *prefixFormatter) Format(entry *log.Entry) ([]byte, error) {
 }
 
 func setLogFormatter(prefix string) {
+	if !strings.HasSuffix(prefix, " ") {
+		prefix += " "
+	}
 	f := prefixFormatter{
 		prefix: []byte(prefix),
 		// reuse weave's log format

diff --git a/prog/probe.go b/prog/probe.go
@@ -77,15 +77,11 @@ func probeMain() {
 		useConntrack       = flag.Bool("conntrack", true, "also use conntrack to track connections")
 		insecure           = flag.Bool("insecure", false, "(SSL) explicitly allow \"insecure\" SSL connections and transfers")
 		logPrefix          = flag.String("log.prefix", "<probe>", "prefix for each log line")
-		logLevel           = flag.String("log-level", "info", "logging threshold level: debug|info|warn|error|fatal|panic")
+		logLevel           = flag.String("log.level", "info", "logging threshold level: debug|info|warn|error|fatal|panic")
 	)
 	flag.Parse()
 
 	setLogLevel(*logLevel)
-
-	if !strings.HasSuffix(*logPrefix, " ") {
-		*logPrefix += " "
-	}
 	setLogFormatter(*logPrefix)
 
 	// Setup in memory metrics sink