docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace latest log by logrus 

Related to #11618 and #11614

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2015-07-02 16:11:52 +02:00
parent 98f988f62c
commit 10e114fb95
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/execdriver/lxc/init.go
View File

@ -6,13 +6,13 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"log"
"os" "os"
"os/exec" "os/exec"
"runtime" "runtime"
"strings" "strings"
"syscall" "syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
) )
@ -50,7 +50,7 @@ func initializer() {
args := getArgs() args := getArgs()
if err := setupNamespace(args); err != nil { 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]) path, err := exec.LookPath(args.Args[0])
if err != nil { if err != nil {
log.Printf("Unable to locate %v", args.Args[0]) logrus.Infof("Unable to locate %v", args.Args[0])
os.Exit(127) os.Exit(127)
} }

4
graph/list.go
View File

@ -2,11 +2,11 @@ package graph
import ( import (
"fmt" "fmt"
"log"
"path" "path"
"sort" "sort"
"strings" "strings"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/pkg/parsers/filters" "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) imgRef := utils.ImageReference(repoName, ref)
image, err := s.graph.Get(id) image, err := s.graph.Get(id)
if err != nil { 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 continue
} }