From 10e114fb956db1b1a8bc9308cc6d14cbf30a5bab Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 2 Jul 2015 16:11:52 +0200 Subject: [PATCH] Replace latest log by logrus Related to #11618 and #11614 Signed-off-by: Vincent Demeester --- daemon/execdriver/lxc/init.go | 6 +++--- graph/list.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/execdriver/lxc/init.go b/daemon/execdriver/lxc/init.go index a47ece97fd..aba1c74c26 100644 --- a/daemon/execdriver/lxc/init.go +++ b/daemon/execdriver/lxc/init.go @@ -6,13 +6,13 @@ import ( "encoding/json" "flag" "fmt" - "log" "os" "os/exec" "runtime" "strings" "syscall" + "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/reexec" ) @@ -50,7 +50,7 @@ func initializer() { args := getArgs() if err := setupNamespace(args); err != nil { - log.Fatal(err) + logrus.Fatal(err) } } @@ -65,7 +65,7 @@ func setupNamespace(args *InitArgs) error { path, err := exec.LookPath(args.Args[0]) if err != nil { - log.Printf("Unable to locate %v", args.Args[0]) + logrus.Infof("Unable to locate %v", args.Args[0]) os.Exit(127) } diff --git a/graph/list.go b/graph/list.go index f5f51f68b9..fd4d2e89fe 100644 --- a/graph/list.go +++ b/graph/list.go @@ -2,11 +2,11 @@ package graph import ( "fmt" - "log" "path" "sort" "strings" + "github.com/Sirupsen/logrus" "github.com/docker/docker/api/types" "github.com/docker/docker/image" "github.com/docker/docker/pkg/parsers/filters" @@ -79,7 +79,7 @@ func (s *TagStore) Images(config *ImagesConfig) ([]*types.Image, error) { imgRef := utils.ImageReference(repoName, ref) image, err := s.graph.Get(id) if err != nil { - log.Printf("Warning: couldn't load %s from %s: %s", id, imgRef, err) + logrus.Warnf("couldn't load %s from %s: %s", id, imgRef, err) continue }