1. docker
  2. Commit ee7dd44c017458c8fe0be8e09569b1238366dca3
Browse code

Mass gofmt

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Alexandr Morozov authored on 2014/10/25 07:11:48
Showing 32 changed files
daemon/attach.go
History View file @ ee7dd44
... ... 
@@ -6,10 +6,10 @@ import (
6 6 
 	"os"
7 7 
 	"time"
8 8
9 
+	log "github.com/Sirupsen/logrus"
9 10 
 	"github.com/docker/docker/engine"
10 11 
 	"github.com/docker/docker/pkg/ioutils"
11 12 
 	"github.com/docker/docker/pkg/jsonlog"
12 
-	log "github.com/Sirupsen/logrus"
13 13 
 	"github.com/docker/docker/pkg/promise"
14 14 
 	"github.com/docker/docker/utils"
15 15 
 )
daemon/container.go
History View file @ ee7dd44
... ... 
@@ -17,6 +17,7 @@ import (
17 17 
 	"github.com/docker/libcontainer/devices"
18 18 
 	"github.com/docker/libcontainer/label"
19 19
20 
+	log "github.com/Sirupsen/logrus"
20 21 
 	"github.com/docker/docker/daemon/execdriver"
21 22 
 	"github.com/docker/docker/engine"
22 23 
 	"github.com/docker/docker/image"
... ... 
@@ -25,7 +26,6 @@ import (
25 25 
 	"github.com/docker/docker/pkg/archive"
26 26 
 	"github.com/docker/docker/pkg/broadcastwriter"
27 27 
 	"github.com/docker/docker/pkg/ioutils"
28 
-	log "github.com/Sirupsen/logrus"
29 28 
 	"github.com/docker/docker/pkg/networkfs/etchosts"
30 29 
 	"github.com/docker/docker/pkg/networkfs/resolvconf"
31 30 
 	"github.com/docker/docker/pkg/promise"
daemon/daemon_aufs.go
History View file @ ee7dd44
... ... 
@@ -3,10 +3,10 @@
3 3 
 package daemon
4 4
5 5 
 import (
6 
+	log "github.com/Sirupsen/logrus"
6 7 
 	"github.com/docker/docker/daemon/graphdriver"
7 8 
 	"github.com/docker/docker/daemon/graphdriver/aufs"
8 9 
 	"github.com/docker/docker/graph"
9 
-	log "github.com/Sirupsen/logrus"
10 10 
 )
11 11
12 12 
 // Given the graphdriver ad, if it is aufs, then migrate it.
daemon/delete.go
History View file @ ee7dd44
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"os"
6 6 
 	"path"
7 7
8 
-	"github.com/docker/docker/engine"
9 8 
 	log "github.com/Sirupsen/logrus"
9 
+	"github.com/docker/docker/engine"
10 10 
 )
11 11
12 12 
 func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {
daemon/exec.go
History View file @ ee7dd44
... ... 
@@ -9,12 +9,12 @@ import (
9 9 
 	"strings"
10 10 
 	"sync"
11 11
12 
+	log "github.com/Sirupsen/logrus"
12 13 
 	"github.com/docker/docker/daemon/execdriver"
13 14 
 	"github.com/docker/docker/daemon/execdriver/lxc"
14 15 
 	"github.com/docker/docker/engine"
15 16 
 	"github.com/docker/docker/pkg/broadcastwriter"
16 17 
 	"github.com/docker/docker/pkg/ioutils"
17 
-	log "github.com/Sirupsen/logrus"
18 18 
 	"github.com/docker/docker/pkg/promise"
19 19 
 	"github.com/docker/docker/runconfig"
20 20 
 	"github.com/docker/docker/utils"
daemon/execdriver/lxc/driver.go
History View file @ ee7dd44
... ... 
@@ -17,8 +17,8 @@ import (
17 17
18 18 
 	"github.com/kr/pty"
19 19
20 
-	"github.com/docker/docker/daemon/execdriver"
21 20 
 	log "github.com/Sirupsen/logrus"
21 
+	"github.com/docker/docker/daemon/execdriver"
22 22 
 	"github.com/docker/docker/pkg/term"
23 23 
 	"github.com/docker/docker/utils"
24 24 
 	"github.com/docker/libcontainer/cgroups"
daemon/graphdriver/aufs/aufs.go
History View file @ ee7dd44
... ... 
@@ -30,9 +30,9 @@ import (
30 30 
 	"sync"
31 31 
 	"syscall"
32 32
33 
+	log "github.com/Sirupsen/logrus"
33 34 
 	"github.com/docker/docker/daemon/graphdriver"
34 35 
 	"github.com/docker/docker/pkg/archive"
35 
-	log "github.com/Sirupsen/logrus"
36 36 
 	mountpk "github.com/docker/docker/pkg/mount"
37 37 
 	"github.com/docker/docker/utils"
38 38 
 	"github.com/docker/libcontainer/label"
daemon/graphdriver/devmapper/deviceset.go
History View file @ ee7dd44
... ... 
@@ -18,8 +18,8 @@ import (
18 18 
 	"syscall"
19 19 
 	"time"
20 20
21 
-	"github.com/docker/docker/daemon/graphdriver"
22 21 
 	log "github.com/Sirupsen/logrus"
22 
+	"github.com/docker/docker/daemon/graphdriver"
23 23 
 	"github.com/docker/docker/pkg/parsers"
24 24 
 	"github.com/docker/docker/pkg/units"
25 25 
 	"github.com/docker/libcontainer/label"
daemon/graphdriver/devmapper/driver.go
History View file @ ee7dd44
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"os"
9 9 
 	"path"
10 10
11 
-	"github.com/docker/docker/daemon/graphdriver"
12 11 
 	log "github.com/Sirupsen/logrus"
12 
+	"github.com/docker/docker/daemon/graphdriver"
13 13 
 	"github.com/docker/docker/pkg/mount"
14 14 
 	"github.com/docker/docker/pkg/units"
15 15 
 )
daemon/graphdriver/fsdiff.go
History View file @ ee7dd44
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"fmt"
5 5 
 	"time"
6 6
7 
+	log "github.com/Sirupsen/logrus"
7 8 
 	"github.com/docker/docker/pkg/archive"
8 9 
 	"github.com/docker/docker/pkg/ioutils"
9 
-	log "github.com/Sirupsen/logrus"
10 10 
 	"github.com/docker/docker/utils"
11 11 
 )
12 12
daemon/info.go
History View file @ ee7dd44
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"os"
5 5 
 	"runtime"
6 6
7 
+	log "github.com/Sirupsen/logrus"
7 8 
 	"github.com/docker/docker/dockerversion"
8 9 
 	"github.com/docker/docker/engine"
9 
-	log "github.com/Sirupsen/logrus"
10 10 
 	"github.com/docker/docker/pkg/parsers/kernel"
11 11 
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
12 12 
 	"github.com/docker/docker/registry"
daemon/logs.go
History View file @ ee7dd44
... ... 
@@ -8,9 +8,9 @@ import (
8 8 
 	"os"
9 9 
 	"strconv"
10 10
11 
+	log "github.com/Sirupsen/logrus"
11 12 
 	"github.com/docker/docker/engine"
12 13 
 	"github.com/docker/docker/pkg/jsonlog"
13 
-	log "github.com/Sirupsen/logrus"
14 14 
 	"github.com/docker/docker/pkg/tailfile"
15 15 
 	"github.com/docker/docker/pkg/timeutils"
16 16 
 )
daemon/monitor.go
History View file @ ee7dd44
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"sync"
7 7 
 	"time"
8 8
9 
-	"github.com/docker/docker/daemon/execdriver"
10 9 
 	log "github.com/Sirupsen/logrus"
10 
+	"github.com/docker/docker/daemon/execdriver"
11 11 
 	"github.com/docker/docker/runconfig"
12 12 
 )
13 13
daemon/networkdriver/bridge/driver.go
History View file @ ee7dd44
... ... 
@@ -8,13 +8,13 @@ import (
8 8 
 	"strings"
9 9 
 	"sync"
10 10
11 
+	log "github.com/Sirupsen/logrus"
11 12 
 	"github.com/docker/docker/daemon/networkdriver"
12 13 
 	"github.com/docker/docker/daemon/networkdriver/ipallocator"
13 14 
 	"github.com/docker/docker/daemon/networkdriver/portallocator"
14 15 
 	"github.com/docker/docker/daemon/networkdriver/portmapper"
15 16 
 	"github.com/docker/docker/engine"
16 17 
 	"github.com/docker/docker/pkg/iptables"
17 
-	log "github.com/Sirupsen/logrus"
18 18 
 	"github.com/docker/docker/pkg/networkfs/resolvconf"
19 19 
 	"github.com/docker/docker/pkg/parsers/kernel"
20 20 
 	"github.com/docker/libcontainer/netlink"
daemon/networkdriver/portmapper/mapper.go
History View file @ ee7dd44
... ... 
@@ -6,9 +6,9 @@ import (
6 6 
 	"net"
7 7 
 	"sync"
8 8
9 
+	log "github.com/Sirupsen/logrus"
9 10 
 	"github.com/docker/docker/daemon/networkdriver/portallocator"
10 11 
 	"github.com/docker/docker/pkg/iptables"
11 
-	log "github.com/Sirupsen/logrus"
12 12 
 )
13 13
14 14 
 type mapping struct {
daemon/volumes.go
History View file @ ee7dd44
... ... 
@@ -10,9 +10,9 @@ import (
10 10 
 	"strings"
11 11 
 	"syscall"
12 12
13 
+	log "github.com/Sirupsen/logrus"
13 14 
 	"github.com/docker/docker/daemon/execdriver"
14 15 
 	"github.com/docker/docker/pkg/archive"
15 
-	log "github.com/Sirupsen/logrus"
16 16 
 	"github.com/docker/docker/pkg/symlink"
17 17 
 	"github.com/docker/docker/volumes"
18 18 
 )
graph/export.go
History View file @ ee7dd44
... ... 
@@ -7,9 +7,9 @@ import (
7 7 
 	"os"
8 8 
 	"path"
9 9
10 
+	log "github.com/Sirupsen/logrus"
10 11 
 	"github.com/docker/docker/engine"
11 12 
 	"github.com/docker/docker/pkg/archive"
12 
-	log "github.com/Sirupsen/logrus"
13 13 
 	"github.com/docker/docker/pkg/parsers"
14 14 
 )
15 15
graph/graph.go
History View file @ ee7dd44
... ... 
@@ -12,11 +12,11 @@ import (
12 12 
 	"syscall"
13 13 
 	"time"
14 14
15 
+	log "github.com/Sirupsen/logrus"
15 16 
 	"github.com/docker/docker/daemon/graphdriver"
16 17 
 	"github.com/docker/docker/dockerversion"
17 18 
 	"github.com/docker/docker/image"
18 19 
 	"github.com/docker/docker/pkg/archive"
19 
-	log "github.com/Sirupsen/logrus"
20 20 
 	"github.com/docker/docker/pkg/truncindex"
21 21 
 	"github.com/docker/docker/runconfig"
22 22 
 	"github.com/docker/docker/utils"
graph/load.go
History View file @ ee7dd44
... ... 
@@ -7,10 +7,10 @@ import (
7 7 
 	"os"
8 8 
 	"path"
9 9
10 
+	log "github.com/Sirupsen/logrus"
10 11 
 	"github.com/docker/docker/engine"
11 12 
 	"github.com/docker/docker/image"
12 13 
 	"github.com/docker/docker/pkg/archive"
13 
-	log "github.com/Sirupsen/logrus"
14 14 
 )
15 15
16 16 
 // Loads a set of images into the repository. This is the complementary of ImageExport.
graph/pull.go
History View file @ ee7dd44
... ... 
@@ -12,9 +12,9 @@ import (
12 12 
 	"strings"
13 13 
 	"time"
14 14
15 
+	log "github.com/Sirupsen/logrus"
15 16 
 	"github.com/docker/docker/engine"
16 17 
 	"github.com/docker/docker/image"
17 
-	log "github.com/Sirupsen/logrus"
18 18 
 	"github.com/docker/docker/registry"
19 19 
 	"github.com/docker/docker/utils"
20 20 
 	"github.com/docker/libtrust"
graph/push.go
History View file @ ee7dd44
... ... 
@@ -7,9 +7,9 @@ import (
7 7 
 	"os"
8 8 
 	"path"
9 9
10 
+	log "github.com/Sirupsen/logrus"
10 11 
 	"github.com/docker/docker/engine"
11 12 
 	"github.com/docker/docker/pkg/archive"
12 
-	log "github.com/Sirupsen/logrus"
13 13 
 	"github.com/docker/docker/registry"
14 14 
 	"github.com/docker/docker/utils"
15 15 
 )
graph/service.go
History View file @ ee7dd44
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"fmt"
5 5 
 	"io"
6 6
7 
+	log "github.com/Sirupsen/logrus"
7 8 
 	"github.com/docker/docker/engine"
8 9 
 	"github.com/docker/docker/image"
9 
-	log "github.com/Sirupsen/logrus"
10 10 
 )
11 11
12 12 
 func (s *TagStore) Install(eng *engine.Engine) error {
image/image.go
History View file @ ee7dd44
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"strconv"
10 10 
 	"time"
11 11
12 
-	"github.com/docker/docker/pkg/archive"
13 12 
 	log "github.com/Sirupsen/logrus"
13 
+	"github.com/docker/docker/pkg/archive"
14 14 
 	"github.com/docker/docker/runconfig"
15 15 
 	"github.com/docker/docker/utils"
16 16 
 )
integration/commands_test.go
History View file @ ee7dd44
... ... 
@@ -9,9 +9,9 @@ import (
9 9 
 	"testing"
10 10 
 	"time"
11 11
12 
+	log "github.com/Sirupsen/logrus"
12 13 
 	"github.com/docker/docker/api/client"
13 14 
 	"github.com/docker/docker/daemon"
14 
-	log "github.com/Sirupsen/logrus"
15 15 
 	"github.com/docker/docker/pkg/term"
16 16 
 	"github.com/docker/docker/utils"
17 17 
 	"github.com/docker/libtrust"
integration/runtime_test.go
History View file @ ee7dd44
... ... 
@@ -16,12 +16,12 @@ import (
16 16 
 	"testing"
17 17 
 	"time"
18 18
19 
+	log "github.com/Sirupsen/logrus"
19 20 
 	"github.com/docker/docker/daemon"
20 21 
 	"github.com/docker/docker/engine"
21 22 
 	"github.com/docker/docker/image"
22 23 
 	"github.com/docker/docker/nat"
23 24 
 	"github.com/docker/docker/pkg/ioutils"
24 
-	log "github.com/Sirupsen/logrus"
25 25 
 	"github.com/docker/docker/reexec"
26 26 
 	"github.com/docker/docker/runconfig"
27 27 
 	"github.com/docker/docker/utils"
pkg/archive/archive.go
History View file @ ee7dd44
... ... 
@@ -18,8 +18,8 @@ import (
18 18
19 19 
 	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
20 20
21 
-	"github.com/docker/docker/pkg/fileutils"
22 21 
 	log "github.com/Sirupsen/logrus"
22 
+	"github.com/docker/docker/pkg/fileutils"
23 23 
 	"github.com/docker/docker/pkg/pools"
24 24 
 	"github.com/docker/docker/pkg/promise"
25 25 
 	"github.com/docker/docker/pkg/system"
pkg/broadcastwriter/broadcastwriter.go
History View file @ ee7dd44
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"sync"
7 7 
 	"time"
8 8
9 
-	"github.com/docker/docker/pkg/jsonlog"
10 9 
 	log "github.com/Sirupsen/logrus"
10 
+	"github.com/docker/docker/pkg/jsonlog"
11 11 
 )
12 12
13 13 
 // BroadcastWriter accumulate multiple io.WriteCloser by stream.
registry/session.go
History View file @ ee7dd44
... ... 
@@ -17,8 +17,8 @@ import (
17 17 
 	"strings"
18 18 
 	"time"
19 19
20 
-	"github.com/docker/docker/pkg/httputils"
21 20 
 	log "github.com/Sirupsen/logrus"
21 
+	"github.com/docker/docker/pkg/httputils"
22 22 
 	"github.com/docker/docker/pkg/tarsum"
23 23 
 	"github.com/docker/docker/utils"
24 24 
 )
runconfig/merge.go
History View file @ ee7dd44
... ... 
@@ -3,8 +3,8 @@ package runconfig
3 3 
 import (
4 4 
 	"strings"
5 5
6 
-	"github.com/docker/docker/nat"
7 6 
 	log "github.com/Sirupsen/logrus"
7 
+	"github.com/docker/docker/nat"
8 8 
 )
9 9
10 10 
 func Merge(userConf, imageConf *Config) error {
trust/service.go
History View file @ ee7dd44
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"fmt"
5 5 
 	"time"
6 6
7 
-	"github.com/docker/docker/engine"
8 7 
 	log "github.com/Sirupsen/logrus"
8 
+	"github.com/docker/docker/engine"
9 9 
 	"github.com/docker/libtrust"
10 10 
 )
11 11
utils/utils.go
History View file @ ee7dd44
... ... 
@@ -20,10 +20,10 @@ import (
20 20 
 	"sync"
21 21 
 	"syscall"
22 22
23 
+	log "github.com/Sirupsen/logrus"
23 24 
 	"github.com/docker/docker/dockerversion"
24 25 
 	"github.com/docker/docker/pkg/fileutils"
25 26 
 	"github.com/docker/docker/pkg/ioutils"
26 
-	log "github.com/Sirupsen/logrus"
27 27 
 )
28 28
29 29 
 type KeyValuePair struct {
volumes/repository.go
History View file @ ee7dd44
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"path/filepath"
8 8 
 	"sync"
9 9
10 
-	"github.com/docker/docker/daemon/graphdriver"
11 10 
 	log "github.com/Sirupsen/logrus"
11 
+	"github.com/docker/docker/daemon/graphdriver"
12 12 
 	"github.com/docker/docker/utils"
13 13 
 )
14 14