From ee7dd44c017458c8fe0be8e09569b1238366dca3 Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Fri, 24 Oct 2014 15:11:48 -0700 Subject: [PATCH] Mass gofmt Signed-off-by: Alexandr Morozov --- daemon/attach.go | 2 +- daemon/container.go | 2 +- daemon/daemon_aufs.go | 2 +- daemon/delete.go | 2 +- daemon/exec.go | 2 +- daemon/execdriver/lxc/driver.go | 2 +- daemon/graphdriver/aufs/aufs.go | 2 +- daemon/graphdriver/devmapper/deviceset.go | 2 +- daemon/graphdriver/devmapper/driver.go | 2 +- daemon/graphdriver/fsdiff.go | 2 +- daemon/info.go | 2 +- daemon/logs.go | 2 +- daemon/monitor.go | 2 +- daemon/networkdriver/bridge/driver.go | 2 +- daemon/networkdriver/portmapper/mapper.go | 2 +- daemon/volumes.go | 2 +- graph/export.go | 2 +- graph/graph.go | 2 +- graph/load.go | 2 +- graph/pull.go | 2 +- graph/push.go | 2 +- graph/service.go | 2 +- image/image.go | 2 +- integration/commands_test.go | 2 +- integration/runtime_test.go | 2 +- pkg/archive/archive.go | 2 +- pkg/broadcastwriter/broadcastwriter.go | 2 +- registry/session.go | 2 +- runconfig/merge.go | 2 +- trust/service.go | 2 +- utils/utils.go | 2 +- volumes/repository.go | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/daemon/attach.go b/daemon/attach.go index de583846ee..f2cc6bd469 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -6,10 +6,10 @@ import ( "os" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/jsonlog" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/promise" "github.com/docker/docker/utils" ) diff --git a/daemon/container.go b/daemon/container.go index 1a0d943d3f..a477f19f22 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -17,6 +17,7 @@ import ( "github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/label" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/engine" "github.com/docker/docker/image" @@ -25,7 +26,6 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/ioutils" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/networkfs/etchosts" "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/promise" diff --git a/daemon/daemon_aufs.go b/daemon/daemon_aufs.go index 6b84d40727..7d4d3c32e9 100644 --- a/daemon/daemon_aufs.go +++ b/daemon/daemon_aufs.go @@ -3,10 +3,10 @@ package daemon import ( + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/aufs" "github.com/docker/docker/graph" - log "github.com/Sirupsen/logrus" ) // Given the graphdriver ad, if it is aufs, then migrate it. diff --git a/daemon/delete.go b/daemon/delete.go index b382f6d843..55678f90a1 100644 --- a/daemon/delete.go +++ b/daemon/delete.go @@ -5,8 +5,8 @@ import ( "os" "path" - "github.com/docker/docker/engine" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/engine" ) func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status { diff --git a/daemon/exec.go b/daemon/exec.go index 473a6a0d15..eae096e680 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -9,12 +9,12 @@ import ( "strings" "sync" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver/lxc" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/ioutils" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/promise" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index ca8573c30f..7583a3e64f 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -17,8 +17,8 @@ import ( "github.com/kr/pty" - "github.com/docker/docker/daemon/execdriver" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/pkg/term" "github.com/docker/docker/utils" "github.com/docker/libcontainer/cgroups" diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index a60b8c7f30..8ba097d45a 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -30,9 +30,9 @@ import ( "sync" "syscall" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" mountpk "github.com/docker/docker/pkg/mount" "github.com/docker/docker/utils" "github.com/docker/libcontainer/label" diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 6c16a2798f..fdfc089a82 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -18,8 +18,8 @@ import ( "syscall" "time" - "github.com/docker/docker/daemon/graphdriver" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/units" "github.com/docker/libcontainer/label" diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go index 8c5b148fab..53b8da436d 100644 --- a/daemon/graphdriver/devmapper/driver.go +++ b/daemon/graphdriver/devmapper/driver.go @@ -8,8 +8,8 @@ import ( "os" "path" - "github.com/docker/docker/daemon/graphdriver" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/units" ) diff --git a/daemon/graphdriver/fsdiff.go b/daemon/graphdriver/fsdiff.go index fcfa908853..269379bddf 100644 --- a/daemon/graphdriver/fsdiff.go +++ b/daemon/graphdriver/fsdiff.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/ioutils" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/utils" ) diff --git a/daemon/info.go b/daemon/info.go index 1bf1b2176b..b1c195d736 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -4,9 +4,9 @@ import ( "os" "runtime" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/dockerversion" "github.com/docker/docker/engine" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/operatingsystem" "github.com/docker/docker/registry" diff --git a/daemon/logs.go b/daemon/logs.go index 31d6fd5223..a5fac2c3d9 100644 --- a/daemon/logs.go +++ b/daemon/logs.go @@ -8,9 +8,9 @@ import ( "os" "strconv" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/jsonlog" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/tailfile" "github.com/docker/docker/pkg/timeutils" ) diff --git a/daemon/monitor.go b/daemon/monitor.go index c0943465e1..cbb74c335b 100644 --- a/daemon/monitor.go +++ b/daemon/monitor.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/docker/docker/daemon/execdriver" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/runconfig" ) diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index 08b955d03b..c967aebb79 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -8,13 +8,13 @@ import ( "strings" "sync" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/networkdriver" "github.com/docker/docker/daemon/networkdriver/ipallocator" "github.com/docker/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/daemon/networkdriver/portmapper" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/iptables" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/libcontainer/netlink" diff --git a/daemon/networkdriver/portmapper/mapper.go b/daemon/networkdriver/portmapper/mapper.go index b7bc90244f..4bf8cd142c 100644 --- a/daemon/networkdriver/portmapper/mapper.go +++ b/daemon/networkdriver/portmapper/mapper.go @@ -6,9 +6,9 @@ import ( "net" "sync" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/pkg/iptables" - log "github.com/Sirupsen/logrus" ) type mapping struct { diff --git a/daemon/volumes.go b/daemon/volumes.go index 84de15a609..0fd54144ed 100644 --- a/daemon/volumes.go +++ b/daemon/volumes.go @@ -10,9 +10,9 @@ import ( "strings" "syscall" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/volumes" ) diff --git a/graph/export.go b/graph/export.go index 591dcff67a..75314076ed 100644 --- a/graph/export.go +++ b/graph/export.go @@ -7,9 +7,9 @@ import ( "os" "path" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/parsers" ) diff --git a/graph/graph.go b/graph/graph.go index 07fdd5b48d..75b1825034 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -12,11 +12,11 @@ import ( "syscall" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/dockerversion" "github.com/docker/docker/image" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/truncindex" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" diff --git a/graph/load.go b/graph/load.go index 112e7668ed..05e963daaa 100644 --- a/graph/load.go +++ b/graph/load.go @@ -7,10 +7,10 @@ import ( "os" "path" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/image" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" ) // Loads a set of images into the repository. This is the complementary of ImageExport. diff --git a/graph/pull.go b/graph/pull.go index c858d9b498..9345d7d489 100644 --- a/graph/pull.go +++ b/graph/pull.go @@ -12,9 +12,9 @@ import ( "strings" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/image" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/registry" "github.com/docker/docker/utils" "github.com/docker/libtrust" diff --git a/graph/push.go b/graph/push.go index 0a291d580f..a2bd7136f9 100644 --- a/graph/push.go +++ b/graph/push.go @@ -7,9 +7,9 @@ import ( "os" "path" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/archive" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/registry" "github.com/docker/docker/utils" ) diff --git a/graph/service.go b/graph/service.go index 3ed7184687..9b1509af29 100644 --- a/graph/service.go +++ b/graph/service.go @@ -4,9 +4,9 @@ import ( "fmt" "io" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/engine" "github.com/docker/docker/image" - log "github.com/Sirupsen/logrus" ) func (s *TagStore) Install(eng *engine.Engine) error { diff --git a/image/image.go b/image/image.go index ccd77b5067..728a188a14 100644 --- a/image/image.go +++ b/image/image.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/docker/docker/pkg/archive" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/archive" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" ) diff --git a/integration/commands_test.go b/integration/commands_test.go index 446fba3f92..b00c68641e 100644 --- a/integration/commands_test.go +++ b/integration/commands_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/api/client" "github.com/docker/docker/daemon" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/term" "github.com/docker/docker/utils" "github.com/docker/libtrust" diff --git a/integration/runtime_test.go b/integration/runtime_test.go index 00daf2c5c0..d2aac17081 100644 --- a/integration/runtime_test.go +++ b/integration/runtime_test.go @@ -16,12 +16,12 @@ import ( "testing" "time" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon" "github.com/docker/docker/engine" "github.com/docker/docker/image" "github.com/docker/docker/nat" "github.com/docker/docker/pkg/ioutils" - log "github.com/Sirupsen/logrus" "github.com/docker/docker/reexec" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index e4db63ab65..9c4d881cfa 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -18,8 +18,8 @@ import ( "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/docker/docker/pkg/fileutils" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/promise" "github.com/docker/docker/pkg/system" diff --git a/pkg/broadcastwriter/broadcastwriter.go b/pkg/broadcastwriter/broadcastwriter.go index a9ae1047dc..232cf3dfc8 100644 --- a/pkg/broadcastwriter/broadcastwriter.go +++ b/pkg/broadcastwriter/broadcastwriter.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/docker/docker/pkg/jsonlog" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/jsonlog" ) // BroadcastWriter accumulate multiple io.WriteCloser by stream. diff --git a/registry/session.go b/registry/session.go index de97db3aea..0c5f01397a 100644 --- a/registry/session.go +++ b/registry/session.go @@ -17,8 +17,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/httputils" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/httputils" "github.com/docker/docker/pkg/tarsum" "github.com/docker/docker/utils" ) diff --git a/runconfig/merge.go b/runconfig/merge.go index f084d70dd8..98f70873db 100644 --- a/runconfig/merge.go +++ b/runconfig/merge.go @@ -3,8 +3,8 @@ package runconfig import ( "strings" - "github.com/docker/docker/nat" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/nat" ) func Merge(userConf, imageConf *Config) error { diff --git a/trust/service.go b/trust/service.go index 592515db18..324a478f10 100644 --- a/trust/service.go +++ b/trust/service.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/docker/docker/engine" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/engine" "github.com/docker/libtrust" ) diff --git a/utils/utils.go b/utils/utils.go index b495f442a1..061e3bc638 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -20,10 +20,10 @@ import ( "sync" "syscall" + log "github.com/Sirupsen/logrus" "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/ioutils" - log "github.com/Sirupsen/logrus" ) type KeyValuePair struct { diff --git a/volumes/repository.go b/volumes/repository.go index eddb295150..d6612e7a34 100644 --- a/volumes/repository.go +++ b/volumes/repository.go @@ -7,8 +7,8 @@ import ( "path/filepath" "sync" - "github.com/docker/docker/daemon/graphdriver" log "github.com/Sirupsen/logrus" + "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/utils" )