From f96e7dffa9d9cc2cdd7277b2fa12b7bad73724d8 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 17 Feb 2016 16:25:00 +0000 Subject: [PATCH] Use Sirupsen/logrus logger in the Weave tagger --- common/backoff/backoff.go | 7 ++++--- common/weave/client.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/backoff/backoff.go b/common/backoff/backoff.go index 6349147a6..4727a60cc 100644 --- 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 index 6e2ec9f22..b809a10ec 100644 --- 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) } }()