Merge pull request #974 from weaveworks/fix-weave-tagger-logging

Use Sirupsen/logrus logger in the Weave tagger
weaveworks · Feb 18, 2016 · 7bd7cb7 · 7bd7cb7
2 parents 07d3420 + f96e7df
commit 7bd7cb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/common/backoff/backoff.go b/common/backoff/backoff.go
@@ -1,8 +1,9 @@
 package backoff
 
 import (
-	"log"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
 )
 
 type backoff struct {
@@ -69,10 +70,10 @@ func (b *backoff) Start() {
 
 		if shouldLog {
 			if err != nil {
-				log.Printf("Error %s, backing off %s: %s",
+				log.Errorf("Error %s, backing off %s: %s",
 					b.msg, backoff, err)
 			} else {
-				log.Printf("Success %s", b.msg)
+				log.Infof("Success %s", b.msg)
 			}
 		}
 

diff --git a/common/weave/client.go b/common/weave/client.go
@@ -4,13 +4,13 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"log"
 	"net"
 	"net/http"
 	"net/url"
 	"regexp"
 	"strconv"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/ugorji/go/codec"
 
 	"github.com/weaveworks/scope/common/exec"
@@ -127,7 +127,7 @@ func (c *client) PS() (map[string]PSEntry, error) {
 	}
 	defer func() {
 		if err := cmd.Wait(); err != nil {
-			log.Printf("'weave ps' cmd failed: %v", err)
+			log.Errorf("'weave ps' cmd failed: %v", err)
 		}
 	}()