@@ -5,7 +5,7 @@ import (

 	"io"

 	"net/url"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/signal"

@@ -51,7 +51,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {

 	if tty && cli.isTerminalOut {

 		if err := cli.monitorTtySize(cmd.Arg(0), false); err != nil {

-			log.Debugf("Error monitoring TTY size: %s", err)

+			logrus.Debugf("Error monitoring TTY size: %s", err)

 		}

 	}

@@ -17,7 +17,7 @@ import (

 	"strconv"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/pkg/archive"

@@ -198,7 +198,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	// windows: show error message about modified file permissions

 	// FIXME: this is not a valid warning when the daemon is running windows. should be removed once docker engine for windows can build.

 	if runtime.GOOS == "windows" {

-		log.Warn(`SECURITY WARNING: You are building a Docker image from Windows against a Linux Docker host. All files and directories added to build context will have '-rwxr-xr-x' permissions. It is recommended to double check and reset permissions for sensitive files and directories.`)

+		logrus.Warn(`SECURITY WARNING: You are building a Docker image from Windows against a Linux Docker host. All files and directories added to build context will have '-rwxr-xr-x' permissions. It is recommended to double check and reset permissions for sensitive files and directories.`)

 	}

 	var body io.Reader

@@ -5,7 +5,7 @@ import (

 	"fmt"

 	"io"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/pkg/promise"

 	"github.com/docker/docker/runconfig"

@@ -67,9 +67,9 @@ func (cli *DockerCli) CmdExec(args ...string) error {

 	// Block the return until the chan gets closed

 	defer func() {

-		log.Debugf("End of CmdExec(), Waiting for hijack to finish.")

+		logrus.Debugf("End of CmdExec(), Waiting for hijack to finish.")

 		if _, ok := <-hijacked; ok {

-			log.Errorf("Hijack did not finish (chan still open)")

+			logrus.Errorf("Hijack did not finish (chan still open)")

 		}

 	}()

@@ -100,19 +100,19 @@ func (cli *DockerCli) CmdExec(args ...string) error {

 		}

 	case err := <-errCh:

 		if err != nil {

-			log.Debugf("Error hijack: %s", err)

+			logrus.Debugf("Error hijack: %s", err)

 			return err

 		}

 	}

 	if execConfig.Tty && cli.isTerminalIn {

 		if err := cli.monitorTtySize(execID, true); err != nil {

-			log.Errorf("Error monitoring TTY size: %s", err)

+			logrus.Errorf("Error monitoring TTY size: %s", err)

 		}

 	}

 	if err := <-errCh; err != nil {

-		log.Debugf("Error hijack: %s", err)

+		logrus.Debugf("Error hijack: %s", err)

 		return err

 	}

@@ -13,7 +13,7 @@ import (

 	"strings"

 	"time"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/pkg/promise"

@@ -211,7 +211,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea

 			} else {

 				_, err = stdcopy.StdCopy(stdout, stderr, br)

 			}

-			log.Debugf("[hijack] End of stdout")

+			logrus.Debugf("[hijack] End of stdout")

 			return err

 		})

 	}

@@ -219,14 +219,14 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea

 	sendStdin := promise.Go(func() error {

 		if in != nil {

 			io.Copy(rwc, in)

-			log.Debugf("[hijack] End of stdin")

+			logrus.Debugf("[hijack] End of stdin")

 		}

 		if conn, ok := rwc.(interface {

 			CloseWrite() error

 		}); ok {

 			if err := conn.CloseWrite(); err != nil {

-				log.Debugf("Couldn't send EOF: %s", err)

+				logrus.Debugf("Couldn't send EOF: %s", err)

 			}

 		}

 		// Discard errors due to pipe interruption

@@ -235,14 +235,14 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea

 	if stdout != nil || stderr != nil {

 		if err := <-receiveStdout; err != nil {

-			log.Debugf("Error receiveStdout: %s", err)

+			logrus.Debugf("Error receiveStdout: %s", err)

 			return err

 		}

 	}

 	if !cli.isTerminalIn {

 		if err := <-sendStdin; err != nil {

-			log.Debugf("Error sendStdin: %s", err)

+			logrus.Debugf("Error sendStdin: %s", err)

 			return err

 		}

 	}

@@ -5,7 +5,7 @@ import (

 	"os"

 	"time"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/units"

@@ -32,7 +32,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {

 	}

 	if _, err := out.Write(body); err != nil {

-		log.Errorf("Error reading remote info: %s", err)

+		logrus.Errorf("Error reading remote info: %s", err)

 		return err

 	}

 	out.Close()

@@ -91,7 +91,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {

 		if remoteInfo.Exists("SystemTime") {

 			t, err := remoteInfo.GetTime("SystemTime")

 			if err != nil {

-				log.Errorf("Error reading system time: %v", err)

+				logrus.Errorf("Error reading system time: %v", err)

 			} else {

 				fmt.Fprintf(cli.out, "System Time: %s\n", t.Format(time.UnixDate))

 			}

@@ -6,7 +6,7 @@ import (

 	"net/url"

 	"os"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/promise"

 	"github.com/docker/docker/pkg/resolvconf"

@@ -132,9 +132,9 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 	hijacked := make(chan io.Closer)

 	// Block the return until the chan gets closed

 	defer func() {

-		log.Debugf("End of CmdRun(), Waiting for hijack to finish.")

+		logrus.Debugf("End of CmdRun(), Waiting for hijack to finish.")

 		if _, ok := <-hijacked; ok {

-			log.Errorf("Hijack did not finish (chan still open)")

+			logrus.Errorf("Hijack did not finish (chan still open)")

 		}

 	}()

 	if config.AttachStdin || config.AttachStdout || config.AttachStderr {

@@ -176,7 +176,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 		}

 	case err := <-errCh:

 		if err != nil {

-			log.Debugf("Error hijack: %s", err)

+			logrus.Debugf("Error hijack: %s", err)

 			return err

 		}

 	}

@@ -184,7 +184,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 	defer func() {

 		if *flAutoRemove {

 			if _, _, err = readBody(cli.call("DELETE", "/containers/"+createResponse.ID+"?v=1", nil, nil)); err != nil {

-				log.Errorf("Error deleting container: %s", err)

+				logrus.Errorf("Error deleting container: %s", err)

 			}

 		}

 	}()

@@ -196,13 +196,13 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 	if (config.AttachStdin || config.AttachStdout || config.AttachStderr) && config.Tty && cli.isTerminalOut {

 		if err := cli.monitorTtySize(createResponse.ID, false); err != nil {

-			log.Errorf("Error monitoring TTY size: %s", err)

+			logrus.Errorf("Error monitoring TTY size: %s", err)

 		}

 	}

 	if errCh != nil {

 		if err := <-errCh; err != nil {

-			log.Debugf("Error hijack: %s", err)

+			logrus.Debugf("Error hijack: %s", err)

 			return err

 		}

 	}

@@ -6,7 +6,7 @@ import (

 	"net/url"

 	"os"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/promise"

@@ -30,10 +30,10 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {

 				}

 			}

 			if sig == "" {

-				log.Errorf("Unsupported signal: %v. Discarding.", s)

+				logrus.Errorf("Unsupported signal: %v. Discarding.", s)

 			}

 			if _, _, err := readBody(cli.call("POST", fmt.Sprintf("/containers/%s/kill?signal=%s", cid, sig), nil, nil)); err != nil {

-				log.Debugf("Error sending signal: %s", err)

+				logrus.Debugf("Error sending signal: %s", err)

 			}

 		}

 	}()

@@ -94,9 +94,9 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 		hijacked := make(chan io.Closer)

 		// Block the return until the chan gets closed

 		defer func() {

-			log.Debugf("CmdStart() returned, defer waiting for hijack to finish.")

+			logrus.Debugf("CmdStart() returned, defer waiting for hijack to finish.")

 			if _, ok := <-hijacked; ok {

-				log.Errorf("Hijack did not finish (chan still open)")

+				logrus.Errorf("Hijack did not finish (chan still open)")

 			}

 			cli.in.Close()

 		}()

@@ -145,7 +145,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 	if *openStdin || *attach {

 		if tty && cli.isTerminalOut {

 			if err := cli.monitorTtySize(cmd.Arg(0), false); err != nil {

-				log.Errorf("Error monitoring TTY size: %s", err)

+				logrus.Errorf("Error monitoring TTY size: %s", err)

 			}

 		}

 		if attchErr := <-cErr; attchErr != nil {

@@ -15,7 +15,7 @@ import (

 	"strconv"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/engine"

@@ -195,7 +195,7 @@ func (cli *DockerCli) streamBody(body io.ReadCloser, contentType string, setRawT

 		} else {

 			_, err = stdcopy.StdCopy(stdout, stderr, body)

 		}

-		log.Debugf("[stream] End of stdout")

+		logrus.Debugf("[stream] End of stdout")

 		return err

 	}

 	return nil

@@ -218,7 +218,7 @@ func (cli *DockerCli) resizeTty(id string, isExec bool) {

 	}

 	if _, _, err := readBody(cli.call("POST", path+v.Encode(), nil, nil)); err != nil {

-		log.Debugf("Error resize: %s", err)

+		logrus.Debugf("Error resize: %s", err)

 	}

 }

@@ -295,7 +295,7 @@ func (cli *DockerCli) getTtySize() (int, int) {

 	}

 	ws, err := term.GetWinsize(cli.outFd)

 	if err != nil {

-		log.Debugf("Error getting size: %s", err)

+		logrus.Debugf("Error getting size: %s", err)

 		if ws == nil {

 			return 0, 0

 		}

@@ -4,7 +4,7 @@ import (

 	"fmt"

 	"runtime"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/engine"

@@ -41,11 +41,11 @@ func (cli *DockerCli) CmdVersion(args ...string) error {

 	out := engine.NewOutput()

 	remoteVersion, err := out.AddEnv()

 	if err != nil {

-		log.Errorf("Error reading remote version: %s", err)

+		logrus.Errorf("Error reading remote version: %s", err)

 		return err

 	}

 	if _, err := out.Write(body); err != nil {

-		log.Errorf("Error reading remote version: %s", err)

+		logrus.Errorf("Error reading remote version: %s", err)

 		return err

 	}

 	out.Close()

@@ -7,7 +7,7 @@ import (

 	"path/filepath"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/version"

@@ -105,7 +105,7 @@ func FormGroup(key string, start, last int) string {

 func MatchesContentType(contentType, expectedType string) bool {

 	mimetype, _, err := mime.ParseMediaType(contentType)

 	if err != nil {

-		log.Errorf("Error parsing media type: %s error: %v", contentType, err)

+		logrus.Errorf("Error parsing media type: %s error: %v", contentType, err)

 	}

 	return err == nil && mimetype == expectedType

 }

@@ -24,7 +24,7 @@ import (

 	"github.com/docker/libcontainer/user"

 	"github.com/gorilla/mux"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/daemon/networkdriver/portallocator"

@@ -135,7 +135,7 @@ func httpError(w http.ResponseWriter, err error) {

 	}

 	if err != nil {

-		log.Errorf("HTTP Error: statusCode=%d %v", statusCode, err)

+		logrus.Errorf("HTTP Error: statusCode=%d %v", statusCode, err)

 		http.Error(w, err.Error(), statusCode)

 	}

 }

@@ -517,7 +517,7 @@ func postCommit(eng *engine.Engine, version version.Version, w http.ResponseWrit

 	}

 	if err := config.Decode(r.Body); err != nil {

-		log.Errorf("%s", err)

+		logrus.Errorf("%s", err)

 	}

 	if r.FormValue("pause") == "" && version.GreaterThanOrEqualTo("1.13") {

@@ -987,7 +987,7 @@ func wsContainersAttach(eng *engine.Engine, version version.Version, w http.Resp

 		job.Stdout.Add(ws)

 		job.Stderr.Set(ws)

 		if err := job.Run(); err != nil {

-			log.Errorf("Error attaching websocket: %s", err)

+			logrus.Errorf("Error attaching websocket: %s", err)

 		}

 	})

 	h.ServeHTTP(w, r)

@@ -1101,7 +1101,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite

 			select {

 			case <-finished:

 			case <-closeNotifier.CloseNotify():

-				log.Infof("Client disconnected, cancelling job: %s", job.Name)

+				logrus.Infof("Client disconnected, cancelling job: %s", job.Name)

 				job.Cancel()

 			}

 		}()

@@ -1146,7 +1146,7 @@ func postContainersCopy(eng *engine.Engine, version version.Version, w http.Resp

 	job.Stdout.Add(w)

 	w.Header().Set("Content-Type", "application/x-tar")

 	if err := job.Run(); err != nil {

-		log.Errorf("%v", err)

+		logrus.Errorf("%v", err)

 		if strings.Contains(strings.ToLower(err.Error()), "no such id") {

 			w.WriteHeader(http.StatusNotFound)

 		} else if strings.Contains(err.Error(), "no such file or directory") {

@@ -1262,7 +1262,7 @@ func optionsHandler(eng *engine.Engine, version version.Version, w http.Response

 	return nil

 }

 func writeCorsHeaders(w http.ResponseWriter, r *http.Request, corsHeaders string) {

-	log.Debugf("CORS header is enabled and set to: %s", corsHeaders)

+	logrus.Debugf("CORS header is enabled and set to: %s", corsHeaders)

 	w.Header().Add("Access-Control-Allow-Origin", corsHeaders)

 	w.Header().Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")

 	w.Header().Add("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS")

@@ -1276,16 +1276,16 @@ func ping(eng *engine.Engine, version version.Version, w http.ResponseWriter, r

 func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, corsHeaders string, dockerVersion version.Version) http.HandlerFunc {

 	return func(w http.ResponseWriter, r *http.Request) {

 		// log the request

-		log.Debugf("Calling %s %s", localMethod, localRoute)

+		logrus.Debugf("Calling %s %s", localMethod, localRoute)

 		if logging {

-			log.Infof("%s %s", r.Method, r.RequestURI)

+			logrus.Infof("%s %s", r.Method, r.RequestURI)

 		}

 		if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {

 			userAgent := strings.Split(r.Header.Get("User-Agent"), "/")

 			if len(userAgent) == 2 && !dockerVersion.Equal(version.Version(userAgent[1])) {

-				log.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], dockerVersion)

+				logrus.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], dockerVersion)

 			}

 		}

 		version := version.Version(mux.Vars(r)["version"])

@@ -1302,7 +1302,7 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local

 		}

 		if err := handlerFunc(eng, version, w, r, mux.Vars(r)); err != nil {

-			log.Errorf("Handler for %s %s returned error: %s", localMethod, localRoute, err)

+			logrus.Errorf("Handler for %s %s returned error: %s", localMethod, localRoute, err)

 			httpError(w, err)

 		}

 	}

@@ -1406,7 +1406,7 @@ func createRouter(eng *engine.Engine, logging, enableCors bool, corsHeaders stri

 	for method, routes := range m {

 		for route, fct := range routes {

-			log.Debugf("Registering %s, %s", method, route)

+			logrus.Debugf("Registering %s, %s", method, route)

 			// NOTE: scope issue, make sure the variables are local and won't be changed

 			localRoute := route

 			localFct := fct

@@ -1454,7 +1454,7 @@ func lookupGidByName(nameOrGid string) (int, error) {

 	}

 	gid, err := strconv.Atoi(nameOrGid)

 	if err == nil {

-		log.Warnf("Could not find GID %d", gid)

+		logrus.Warnf("Could not find GID %d", gid)

 		return gid, nil

 	}

 	return -1, fmt.Errorf("Group %s not found", nameOrGid)

@@ -1504,7 +1504,7 @@ func changeGroup(addr string, nameOrGid string) error {

 		return err

 	}

-	log.Debugf("%s group found. gid: %d", nameOrGid, gid)

+	logrus.Debugf("%s group found. gid: %d", nameOrGid, gid)

 	return os.Chown(addr, 0, gid)

 }

@@ -1517,7 +1517,7 @@ func setSocketGroup(addr, group string) error {

 		if group != "docker" {

 			return err

 		}

-		log.Debugf("Warning: could not chgrp %s to docker: %v", addr, err)

+		logrus.Debugf("Warning: could not chgrp %s to docker: %v", addr, err)

 	}

 	return nil

@@ -1551,7 +1551,7 @@ func allocateDaemonPort(addr string) error {

 func setupTcpHttp(addr string, job *engine.Job) (*HttpServer, error) {

 	if !job.GetenvBool("TlsVerify") {

-		log.Infof("/!\\ DON'T BIND ON ANY IP ADDRESS WITHOUT setting -tlsverify IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")

+		logrus.Infof("/!\\ DON'T BIND ON ANY IP ADDRESS WITHOUT setting -tlsverify IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")

 	}

 	r := createRouter(job.Eng, job.GetenvBool("Logging"), job.GetenvBool("EnableCors"), job.Getenv("CorsHeaders"), job.Getenv("Version"))

@@ -1601,7 +1601,7 @@ func ServeApi(job *engine.Job) error {

 			return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)

 		}

 		go func() {

-			log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])

+			logrus.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])

 			srv, err := NewServer(protoAddrParts[0], protoAddrParts[1], job)

 			if err != nil {

 				chErrors <- err

@@ -1609,7 +1609,7 @@ func ServeApi(job *engine.Job) error {

 			}

 			job.Eng.OnShutdown(func() {

 				if err := srv.Close(); err != nil {

-					log.Error(err)

+					logrus.Error(err)

 				}

 			})

 			if err = srv.Serve(); err != nil && strings.Contains(err.Error(), "use of closed network connection") {

@@ -15,7 +15,7 @@ import (

 	"sort"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/nat"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/runconfig"

@@ -264,7 +264,7 @@ func run(b *Builder, args []string, attributes map[string]bool, original string)

 	defer func(cmd []string) { b.Config.Cmd = cmd }(cmd)

-	log.Debugf("[BUILDER] Command to be executed: %v", b.Config.Cmd)

+	logrus.Debugf("[BUILDER] Command to be executed: %v", b.Config.Cmd)

 	hit, err := b.probeCache()

 	if err != nil {

@@ -26,7 +26,7 @@ import (

 	"path/filepath"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/builder/command"

 	"github.com/docker/docker/builder/parser"

@@ -150,7 +150,7 @@ func (b *Builder) Run(context io.Reader) (string, error) {

 	defer func() {

 		if err := os.RemoveAll(b.contextPath); err != nil {

-			log.Debugf("[BUILDER] failed to remove temporary context: %s", err)

+			logrus.Debugf("[BUILDER] failed to remove temporary context: %s", err)

 		}

 	}()

@@ -166,7 +166,7 @@ func (b *Builder) Run(context io.Reader) (string, error) {

 	for i, n := range b.dockerfile.Children {

 		select {

 		case <-b.cancelled:

-			log.Debug("Builder: build cancelled!")

+			logrus.Debug("Builder: build cancelled!")

 			fmt.Fprintf(b.OutStream, "Build cancelled")

 			return "", fmt.Errorf("Build cancelled")

 		default:

@@ -19,7 +19,7 @@ import (

 	"syscall"

 	"time"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/builder/parser"

 	"github.com/docker/docker/daemon"

 	imagepkg "github.com/docker/docker/image"

@@ -522,13 +522,13 @@ func (b *Builder) probeCache() (bool, error) {

 		return false, err

 	}

 	if cache == nil {

-		log.Debugf("[BUILDER] Cache miss")

+		logrus.Debugf("[BUILDER] Cache miss")

 		b.cacheBusted = true

 		return false, nil

 	}

 	fmt.Fprintf(b.OutStream, " ---> Using cache\n")

-	log.Debugf("[BUILDER] Use cached version")

+	logrus.Debugf("[BUILDER] Use cached version")

 	b.image = cache.ID

 	return true, nil

 }

@@ -587,7 +587,7 @@ func (b *Builder) run(c *daemon.Container) error {

 	go func() {

 		select {

 		case <-b.cancelled:

-			log.Debugln("Build cancelled, killing container:", c.ID)

+			logrus.Debugln("Build cancelled, killing container:", c.ID)

 			c.Kill()

 		case <-finished:

 		}

@@ -688,7 +688,7 @@ func (b *Builder) addContext(container *daemon.Container, orig, dest string, dec

 		if err := chrootarchive.UntarPath(origPath, tarDest); err == nil {

 			return nil

 		} else if err != io.EOF {

-			log.Debugf("Couldn't untar %s to %s: %s", origPath, tarDest, err)

+			logrus.Debugf("Couldn't untar %s to %s: %s", origPath, tarDest, err)

 		}

 	}

@@ -9,7 +9,7 @@ import (

 	"strconv"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/daemon/graphdriver/devmapper"

 	"github.com/docker/docker/pkg/devicemapper"

 )

@@ -63,7 +63,7 @@ func main() {

 	if *flDebug {

 		os.Setenv("DEBUG", "1")

-		log.SetLevel(log.DebugLevel)

+		logrus.SetLevel(logrus.DebugLevel)

 	}

 	if flag.NArg() < 1 {

@@ -8,7 +8,7 @@ import (

 	"sync"

 	"time"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/jsonlog"

 	"github.com/docker/docker/pkg/promise"

@@ -39,25 +39,25 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) error {

 		cLog, err := container.ReadLog("json")

 		if err != nil && os.IsNotExist(err) {

 			// Legacy logs

-			log.Debugf("Old logs format")

+			logrus.Debugf("Old logs format")

 			if stdout {

 				cLog, err := container.ReadLog("stdout")

 				if err != nil {

-					log.Errorf("Error reading logs (stdout): %s", err)

+					logrus.Errorf("Error reading logs (stdout): %s", err)

 				} else if _, err := io.Copy(job.Stdout, cLog); err != nil {

-					log.Errorf("Error streaming logs (stdout): %s", err)

+					logrus.Errorf("Error streaming logs (stdout): %s", err)

 				}

 			}

 			if stderr {

 				cLog, err := container.ReadLog("stderr")

 				if err != nil {

-					log.Errorf("Error reading logs (stderr): %s", err)

+					logrus.Errorf("Error reading logs (stderr): %s", err)

 				} else if _, err := io.Copy(job.Stderr, cLog); err != nil {

-					log.Errorf("Error streaming logs (stderr): %s", err)

+					logrus.Errorf("Error streaming logs (stderr): %s", err)

 				}

 			}

 		} else if err != nil {

-			log.Errorf("Error reading logs (json): %s", err)

+			logrus.Errorf("Error reading logs (json): %s", err)

 		} else {

 			dec := json.NewDecoder(cLog)

 			for {

@@ -66,7 +66,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) error {

 				if err := dec.Decode(l); err == io.EOF {

 					break

 				} else if err != nil {

-					log.Errorf("Error streaming logs: %s", err)

+					logrus.Errorf("Error streaming logs: %s", err)

 					break

 				}

 				if l.Stream == "stdout" && stdout {

@@ -90,7 +90,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) error {

 			r, w := io.Pipe()

 			go func() {

 				defer w.Close()

-				defer log.Debugf("Closing buffered stdin pipe")

+				defer logrus.Debugf("Closing buffered stdin pipe")

 				io.Copy(w, job.Stdin)

 			}()

 			cStdin = r

@@ -140,7 +140,7 @@ func (daemon *Daemon) Attach(streamConfig *StreamConfig, openStdin, stdinOnce, t

 		if stdin == nil || !openStdin {

 			return

 		}

-		log.Debugf("attach: stdin: begin")

+		logrus.Debugf("attach: stdin: begin")

 		defer func() {

 			if stdinOnce && !tty {

 				cStdin.Close()

@@ -154,7 +154,7 @@ func (daemon *Daemon) Attach(streamConfig *StreamConfig, openStdin, stdinOnce, t

 				}

 			}

 			wg.Done()

-			log.Debugf("attach: stdin: end")

+			logrus.Debugf("attach: stdin: end")

 		}()

 		var err error

@@ -168,7 +168,7 @@ func (daemon *Daemon) Attach(streamConfig *StreamConfig, openStdin, stdinOnce, t

 			err = nil

 		}

 		if err != nil {

-			log.Errorf("attach: stdin: %s", err)

+			logrus.Errorf("attach: stdin: %s", err)

 			errors <- err

 			return

 		}

@@ -185,16 +185,16 @@ func (daemon *Daemon) Attach(streamConfig *StreamConfig, openStdin, stdinOnce, t

 			}

 			streamPipe.Close()

 			wg.Done()

-			log.Debugf("attach: %s: end", name)

+			logrus.Debugf("attach: %s: end", name)

 		}()

-		log.Debugf("attach: %s: begin", name)

+		logrus.Debugf("attach: %s: begin", name)

 		_, err := io.Copy(stream, streamPipe)

 		if err == io.ErrClosedPipe {

 			err = nil

 		}

 		if err != nil {

-			log.Errorf("attach: %s: %v", name, err)

+			logrus.Errorf("attach: %s: %v", name, err)

 			errors <- err

 		}

 	}

@@ -19,7 +19,7 @@ import (

 	"github.com/docker/libcontainer/devices"

 	"github.com/docker/libcontainer/label"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/daemon/execdriver"

 	"github.com/docker/docker/daemon/logger"

 	"github.com/docker/docker/daemon/logger/jsonfilelog"

@@ -201,7 +201,7 @@ func (container *Container) WriteHostConfig() error {

 func (container *Container) LogEvent(action string) {

 	d := container.daemon

 	if err := d.eng.Job("log", action, container.ID, d.Repositories().ImageName(container.ImageID)).Run(); err != nil {

-		log.Errorf("Error logging event %s for %s: %s", action, container.ID, err)

+		logrus.Errorf("Error logging event %s for %s: %s", action, container.ID, err)

 	}

 }

@@ -659,7 +659,7 @@ func (container *Container) cleanup() {

 	}

 	if err := container.Unmount(); err != nil {

-		log.Errorf("%v: Failed to umount filesystem: %v", container.ID, err)

+		logrus.Errorf("%v: Failed to umount filesystem: %v", container.ID, err)

 	}

 	for _, eConfig := range container.execCommands.s {

@@ -668,7 +668,7 @@ func (container *Container) cleanup() {

 }

 func (container *Container) KillSig(sig int) error {

-	log.Debugf("Sending %d to %s", sig, container.ID)

+	logrus.Debugf("Sending %d to %s", sig, container.ID)

 	container.Lock()

 	defer container.Unlock()

@@ -699,7 +699,7 @@ func (container *Container) KillSig(sig int) error {

 func (container *Container) killPossiblyDeadProcess(sig int) error {

 	err := container.KillSig(sig)

 	if err == syscall.ESRCH {

-		log.Debugf("Cannot kill process (pid=%d) with signal %d: no such process.", container.GetPid(), sig)

+		logrus.Debugf("Cannot kill process (pid=%d) with signal %d: no such process.", container.GetPid(), sig)

 		return nil

 	}

 	return err

@@ -739,12 +739,12 @@ func (container *Container) Kill() error {

 	if _, err := container.WaitStop(10 * time.Second); err != nil {

 		// Ensure that we don't kill ourselves

 		if pid := container.GetPid(); pid != 0 {

-			log.Infof("Container %s failed to exit within 10 seconds of kill - trying direct SIGKILL", stringid.TruncateID(container.ID))

+			logrus.Infof("Container %s failed to exit within 10 seconds of kill - trying direct SIGKILL", stringid.TruncateID(container.ID))

 			if err := syscall.Kill(pid, 9); err != nil {

 				if err != syscall.ESRCH {

 					return err

 				}

-				log.Debugf("Cannot kill process (pid=%d) with signal 9: no such process.", pid)

+				logrus.Debugf("Cannot kill process (pid=%d) with signal 9: no such process.", pid)

 			}

 		}

 	}

@@ -760,7 +760,7 @@ func (container *Container) Stop(seconds int) error {

 	// 1. Send a SIGTERM

 	if err := container.killPossiblyDeadProcess(15); err != nil {

-		log.Infof("Failed to send SIGTERM to the process, force killing")

+		logrus.Infof("Failed to send SIGTERM to the process, force killing")

 		if err := container.killPossiblyDeadProcess(9); err != nil {

 			return err

 		}

@@ -768,7 +768,7 @@ func (container *Container) Stop(seconds int) error {

 	// 2. Wait for the process to exit on its own

 	if _, err := container.WaitStop(time.Duration(seconds) * time.Second); err != nil {

-		log.Infof("Container %v failed to exit within %d seconds of SIGTERM - using the force", container.ID, seconds)

+		logrus.Infof("Container %v failed to exit within %d seconds of SIGTERM - using the force", container.ID, seconds)

 		// 3. If it doesn't, then send SIGKILL

 		if err := container.Kill(); err != nil {

 			container.WaitStop(-1 * time.Second)

@@ -904,7 +904,7 @@ func (container *Container) GetSize() (int64, int64) {

 	)

 	if err := container.Mount(); err != nil {

-		log.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)

+		logrus.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)

 		return sizeRw, sizeRootfs

 	}

 	defer container.Unmount()

@@ -912,7 +912,7 @@ func (container *Container) GetSize() (int64, int64) {

 	initID := fmt.Sprintf("%s-init", container.ID)

 	sizeRw, err = driver.DiffSize(container.ID, initID)

 	if err != nil {

-		log.Errorf("Driver %s couldn't return diff size of container %s: %s", driver, container.ID, err)

+		logrus.Errorf("Driver %s couldn't return diff size of container %s: %s", driver, container.ID, err)

 		// FIXME: GetSize should return an error. Not changing it now in case

 		// there is a side-effect.

 		sizeRw = -1

@@ -1007,7 +1007,7 @@ func (container *Container) DisableLink(name string) {

 		if link, exists := container.activeLinks[name]; exists {

 			link.Disable()

 		} else {

-			log.Debugf("Could not find active link for %s", name)

+			logrus.Debugf("Could not find active link for %s", name)

 		}

 	}

 }

@@ -1017,7 +1017,7 @@ func (container *Container) setupContainerDns() error {

 		// check if this is an existing container that needs DNS update:

 		if container.UpdateDns {

 			// read the host's resolv.conf, get the hash and call updateResolvConf

-			log.Debugf("Check container (%s) for update to resolv.conf - UpdateDns flag was set", container.ID)

+			logrus.Debugf("Check container (%s) for update to resolv.conf - UpdateDns flag was set", container.ID)

 			latestResolvConf, latestHash := resolvconf.GetLastModified()

 			// clean container resolv.conf re: localhost nameservers and IPv6 NS (if IPv6 disabled)

@@ -1133,7 +1133,7 @@ func (container *Container) updateResolvConf(updatedResolvConf []byte, newResolv

 	//if the user has not modified the resolv.conf of the container since we wrote it last

 	//we will replace it with the updated resolv.conf from the host

 	if string(hashBytes) == curHash {

-		log.Debugf("replacing %q with updated host resolv.conf", container.ResolvConfPath)

+		logrus.Debugf("replacing %q with updated host resolv.conf", container.ResolvConfPath)

 		// for atomic updates to these files, use temporary files with os.Rename:

 		dir := path.Dir(container.ResolvConfPath)

@@ -1172,13 +1172,13 @@ func (container *Container) updateParentsHosts() error {

 		c, err := container.daemon.Get(ref.ParentID)

 		if err != nil {

-			log.Error(err)

+			logrus.Error(err)

 		}

 		if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {

-			log.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)

+			logrus.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)

 			if err := etchosts.Update(c.HostsPath, container.NetworkSettings.IPAddress, ref.Name); err != nil {

-				log.Errorf("Failed to update /etc/hosts in parent container %s for alias %s: %v", c.ID, ref.Name, err)

+				logrus.Errorf("Failed to update /etc/hosts in parent container %s for alias %s: %v", c.ID, ref.Name, err)

 			}

 		}

 	}

@@ -1244,15 +1244,15 @@ func (container *Container) initializeNetworking() error {

 // Make sure the config is compatible with the current kernel

 func (container *Container) verifyDaemonSettings() {

 	if container.Config.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {

-		log.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")

+		logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")

 		container.Config.Memory = 0

 	}

 	if container.Config.Memory > 0 && !container.daemon.sysInfo.SwapLimit {

-		log.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")

+		logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")

 		container.Config.MemorySwap = -1

 	}

 	if container.daemon.sysInfo.IPv4ForwardingDisabled {

-		log.Warnf("IPv4 forwarding is disabled. Networking will not work")

+		logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")

 	}