Mass gofmt

Signed-off-by: Alexandr Morozov <[email protected]>

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"
 )

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"

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.

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 {

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"

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"

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"

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"

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"
 )

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"
 )
 

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"

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"
 )

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"
 )
 

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"

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 {

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"
 )

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"
 )
 

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"

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.

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"

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"
 )

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 {

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"
 )

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"

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"

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"

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.

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"
 )

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 {

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"
 )
 

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 {

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"
 )