Use logrus directly instead of providing a wrapper

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

Hide file tree

Showing 22 changed files with 161 additions and 160 deletions.
diff --git a/app/controls.go b/app/controls.go
@@ -6,9 +6,9 @@ import (
 	"net/rpc"
 	"sync"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
 
-	. "github.com/weaveworks/scope/common/log"
 	"github.com/weaveworks/scope/common/xfer"
 )
 
@@ -73,7 +73,7 @@ func (cr *controlRouter) handleControl(w http.ResponseWriter, r *http.Request) {
 	)
 	handler, ok := cr.get(probeID)
 	if !ok {
-		Log.Errorf("Probe %s is not connected right now...", probeID)
+		log.Errorf("Probe %s is not connected right now...", probeID)
 		http.NotFound(w, r)
 		return
 	}
@@ -101,7 +101,7 @@ func (cr *controlRouter) handleProbeWS(w http.ResponseWriter, r *http.Request) {
 
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		Log.Errorf("Error upgrading to websocket: %v", err)
+		log.Errorf("Error upgrading to websocket: %v", err)
 		return
 	}
 	defer conn.Close()

diff --git a/app/pipes.go b/app/pipes.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
 
-	. "github.com/weaveworks/scope/common/log"
 	"github.com/weaveworks/scope/common/mtime"
 	"github.com/weaveworks/scope/common/xfer"
 )
@@ -99,7 +99,7 @@ func (pr *PipeRouter) timeout() {
 
 		if (pipe.ui.refCount == 0 && now.Sub(pipe.ui.lastUsedTime) >= pipeTimeout) ||
 			(pipe.probe.refCount == 0 && now.Sub(pipe.probe.lastUsedTime) >= pipeTimeout) {
-			Log.Infof("Timing out pipe %s", id)
+			log.Infof("Timing out pipe %s", id)
 			pipe.Close()
 			pipe.tombstoneTime = now
 		}
@@ -122,7 +122,7 @@ func (pr *PipeRouter) getOrCreate(id string) (*pipe, bool) {
 	defer pr.Unlock()
 	p, ok := pr.pipes[id]
 	if !ok {
-		Log.Infof("Creating pipe id %s", id)
+		log.Infof("Creating pipe id %s", id)
 		p = &pipe{
 			ui:    end{lastUsedTime: mtime.Now()},
 			probe: end{lastUsedTime: mtime.Now()},
@@ -178,7 +178,7 @@ func (pr *PipeRouter) handleWs(endSelector func(*pipe) (*end, io.ReadWriter)) fu
 
 		conn, err := upgrader.Upgrade(w, r, nil)
 		if err != nil {
-			Log.Errorf("Error upgrading to websocket: %v", err)
+			log.Errorf("Error upgrading to websocket: %v", err)
 			return
 		}
 		defer conn.Close()
@@ -191,7 +191,7 @@ func (pr *PipeRouter) delete(w http.ResponseWriter, r *http.Request) {
 	pipeID := mux.Vars(r)["pipeID"]
 	pipe, ok := pr.getOrCreate(pipeID)
 	if ok && pr.retain(pipeID, pipe, &pipe.ui) {
-		Log.Infof("Closing pipe %s", pipeID)
+		log.Infof("Closing pipe %s", pipeID)
 		pipe.Close()
 		pipe.tombstoneTime = mtime.Now()
 		pr.release(pipeID, pipe, &pipe.ui)

diff --git a/app/server_helpers.go b/app/server_helpers.go
@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 	"net/http"
 
-	. "github.com/weaveworks/scope/common"
+	log "github.com/Sirupsen/logrus"
 )
 
 func respondWith(w http.ResponseWriter, code int, response interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Add("Cache-Control", "no-cache")
 	w.WriteHeader(code)
 	if err := json.NewEncoder(w).Encode(response); err != nil {
-		Log.Error(err)
+		log.Error(err)
 	}
 }
diff --git a/common/log/log.go b/common/log/log.go
diff --git a/common/sanitize/sanitize.go b/common/sanitize/sanitize.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	. "github.com/weaveworks/scope/common/log"
+	log "github.com/Sirupsen/logrus"
 )
 
 // URL returns a function that sanitizes a URL string. It lets underspecified
@@ -24,7 +24,7 @@ func URL(defaultScheme string, defaultPort int, defaultPath string) func(string)
 		}
 		u, err := url.Parse(s)
 		if err != nil {
-			Log.Errorf("%q: %v", s, err)
+			log.Errorf("%q: %v", s, err)
 			return s // oh well
 		}
 		if _, port, err := net.SplitHostPort(u.Host); err != nil && defaultPort > 0 {

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -88,6 +88,16 @@ while true; do
             fi
             APP_ARGS="$APP_ARGS -$ARG_NAME=$ARG_VALUE"
             ;;
+	--debug)
+            APP_ARGS="$APP_ARGS -log-level=debug"
+	    PROBE_ARGS="$PROBE_ARGS -log-level=debug"
+            ;;
+        --no-app)
+            touch /etc/service/app/down
+            ;;
+        --no-probe)
+            touch /etc/service/probe/down
+            ;;
         --probe.*)
             if echo "$1" | grep "=" 1>/dev/null; then
                 ARG_NAME=$(echo "$1" | sed 's/\-\-probe\.\([^=]*\)=\(.*\)/\1/')
@@ -112,12 +122,6 @@ while true; do
             TOKEN_PROVIDED=true
             touch /etc/service/app/down
             ;;
-        --no-app)
-            touch /etc/service/app/down
-            ;;
-        --no-probe)
-            touch /etc/service/probe/down
-            ;;
         *)
             break
             ;;

diff --git a/probe/appclient/app_client.go b/probe/appclient/app_client.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/websocket"
 
-	. "github.com/weaveworks/scope/common/log"
 	"github.com/weaveworks/scope/common/sanitize"
 	"github.com/weaveworks/scope/common/xfer"
 )
@@ -170,7 +170,7 @@ func (c *appClient) doWithBackoff(msg string, f func() (bool, error)) {
 			continue
 		}
 
-		Log.Errorf("Error doing %s for %s, backing off %s: %v", msg, c.target, backoff, err)
+		log.Errorf("Error doing %s for %s, backing off %s: %v", msg, c.target, backoff, err)
 		select {
 		case <-time.After(backoff):
 		case <-c.quit:
@@ -192,7 +192,7 @@ func (c *appClient) controlConnection() (bool, error) {
 		return false, err
 	}
 	defer func() {
-		Log.Infof("Closing control connection to %s", c.target)
+		log.Infof("Closing control connection to %s", c.target)
 		conn.Close()
 	}()
 
@@ -214,8 +214,8 @@ func (c *appClient) controlConnection() (bool, error) {
 
 func (c *appClient) ControlConnection() {
 	go func() {
-		Log.Infof("Control connection to %s starting", c.target)
-		defer Log.Infof("Control connection to %s exiting", c.target)
+		log.Infof("Control connection to %s starting", c.target)
+		defer log.Infof("Control connection to %s exiting", c.target)
 		c.doWithBackoff("controls", c.controlConnection)
 	}()
 }
@@ -242,8 +242,8 @@ func (c *appClient) publish(r io.Reader) error {
 
 func (c *appClient) startPublishing() {
 	go func() {
-		Log.Infof("Publish loop for %s starting", c.target)
-		defer Log.Infof("Publish loop for %s exiting", c.target)
+		log.Infof("Publish loop for %s starting", c.target)
+		defer log.Infof("Publish loop for %s exiting", c.target)
 		c.doWithBackoff("publish", func() (bool, error) {
 			r := <-c.readers
 			if r == nil {
@@ -291,8 +291,8 @@ func (c *appClient) pipeConnection(id string, pipe xfer.Pipe) (bool, error) {
 
 func (c *appClient) PipeConnection(id string, pipe xfer.Pipe) {
 	go func() {
-		Log.Infof("Pipe %s connection to %s starting", id, c.target)
-		defer Log.Infof("Pipe %s connection to %s exiting", id, c.target)
+		log.Infof("Pipe %s connection to %s starting", id, c.target)
+		defer log.Infof("Pipe %s connection to %s exiting", id, c.target)
 		c.doWithBackoff(id, func() (bool, error) {
 			return c.pipeConnection(id, pipe)
 		})

diff --git a/probe/appclient/multi_client.go b/probe/appclient/multi_client.go
@@ -9,7 +9,8 @@ import (
 	"strings"
 	"sync"
 
-	. "github.com/weaveworks/scope/common/log"
+	log "github.com/Sirupsen/logrus"
+
 	"github.com/weaveworks/scope/common/xfer"
 	"github.com/weaveworks/scope/report"
 )
@@ -75,13 +76,13 @@ func (c *multiClient) Set(hostname string, endpoints []string) {
 
 			client, err := c.clientFactory(hostname, endpoint)
 			if err != nil {
-				Log.Errorf("Error creating new app client: %v", err)
+				log.Errorf("Error creating new app client: %v", err)
 				return
 			}
 
 			details, err := client.Details()
 			if err != nil {
-				Log.Errorf("Error fetching app details: %v", err)
+				log.Errorf("Error fetching app details: %v", err)
 			}
 
 			clients <- clientTuple{details, client}

diff --git a/probe/appclient/resolver.go b/probe/appclient/resolver.go
@@ -6,7 +6,8 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/weaveworks/scope/common/log"
+	log "github.com/Sirupsen/logrus"
+
 	"github.com/weaveworks/scope/common/xfer"
 )
 
@@ -74,7 +75,7 @@ func prepare(strs []string) []target {
 			var err error
 			host, port, err = net.SplitHostPort(s)
 			if err != nil {
-				Log.Errorf("invalid address %s: %v", s, err)
+				log.Errorf("invalid address %s: %v", s, err)
 				continue
 			}
 		} else {

diff --git a/probe/docker/container.go b/probe/docker/container.go
@@ -14,9 +14,9 @@ import (
 	"sync"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	docker "github.com/fsouza/go-dockerclient"
 
-	. "github.com/weaveworks/scope/common/log"
 	"github.com/weaveworks/scope/common/mtime"
 	"github.com/weaveworks/scope/report"
 )
@@ -162,30 +162,30 @@ func (c *container) StartGatheringStats() error {
 	}
 
 	go func() {
-		Log.Infof("docker container: collecting stats for %s", c.container.ID)
+		log.Infof("docker container: collecting stats for %s", c.container.ID)
 		req, err := http.NewRequest("GET", fmt.Sprintf("/containers/%s/stats", c.container.ID), nil)
 		if err != nil {
-			Log.Errorf("docker container: %v", err)
+			log.Errorf("docker container: %v", err)
 			return
 		}
 		req.Header.Set("User-Agent", "weavescope")
 
 		url, err := url.Parse(endpoint)
 		if err != nil {
-			Log.Errorf("docker container: %v", err)
+			log.Errorf("docker container: %v", err)
 			return
 		}
 
 		dial, err := DialStub(url.Scheme, url.Path)
 		if err != nil {
-			Log.Errorf("docker container: %v", err)
+			log.Errorf("docker container: %v", err)
 			return
 		}
 
 		conn := NewClientConnStub(dial, nil)
 		resp, err := conn.Do(req)
 		if err != nil {
-			Log.Errorf("docker container: %v", err)
+			log.Errorf("docker container: %v", err)
 			return
 		}
 		defer resp.Body.Close()
@@ -198,21 +198,21 @@ func (c *container) StartGatheringStats() error {
 			c.Lock()
 			defer c.Unlock()
 
-			Log.Infof("docker container: stopped collecting stats for %s", c.container.ID)
+			log.Infof("docker container: stopped collecting stats for %s", c.container.ID)
 			c.statsConn = nil
 		}()
 
 		var stats docker.Stats
 		decoder := json.NewDecoder(resp.Body)
 		for err := decoder.Decode(&stats); err != io.EOF; err = decoder.Decode(&stats) {
 			if err != nil {
-				Log.Errorf("docker container: error reading event, did container stop? %v", err)
+				log.Errorf("docker container: error reading event, did container stop? %v", err)
 				return
 			}
 
 			c.Lock()
 			if c.numPending >= len(c.pendingStats) {
-				Log.Warnf("docker container: dropping stats.")
+				log.Warnf("docker container: dropping stats.")
 			} else {
 				c.latestStats = stats
 				c.pendingStats[c.numPending] = stats

diff --git a/probe/docker/container_test.go b/probe/docker/container_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	client "github.com/fsouza/go-dockerclient"
 
-	. "github.com/weaveworks/scope/common/log"
 	"github.com/weaveworks/scope/common/mtime"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/report"
@@ -35,7 +35,7 @@ func (c *mockConnection) Close() error {
 }
 
 func TestContainer(t *testing.T) {
-	Log.SetOutput(ioutil.Discard)
+	log.SetOutput(ioutil.Discard)
 
 	oldDialStub, oldNewClientConnStub := docker.DialStub, docker.NewClientConnStub
 	defer func() { docker.DialStub, docker.NewClientConnStub = oldDialStub, oldNewClientConnStub }()