Merge pull request #1252 from dmcgowan/0.2.x-update-logrus

[v0.2.x] Update logrus to v1.0.1
gojoy · Aug 1, 2017 · f6d7c16 · f6d7c16
2 parents 08888ce + 6168011
commit f6d7c16
Show file tree

Hide file tree

Showing 39 changed files with 287 additions and 153 deletions.
diff --git a/api/http/pprof/pprof.go b/api/http/pprof/pprof.go
@@ -7,7 +7,7 @@ import (
 	// net/http/pprof installs the "/debug/pprof/{block,heap,goroutine,threadcreate}" handler
 	_ "net/http/pprof"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // Enable registers the "/debug/pprof" handler

diff --git a/containerd/main.go b/containerd/main.go
@@ -16,7 +16,6 @@ import (
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd"
 	grpcserver "github.com/containerd/containerd/api/grpc/server"
 	"github.com/containerd/containerd/api/grpc/types"
@@ -25,6 +24,7 @@ import (
 	"github.com/cyberdelia/go-metrics-graphite"
 	"github.com/docker/docker/pkg/listeners"
 	"github.com/rcrowley/go-metrics"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 

diff --git a/containerd/main_linux.go b/containerd/main_linux.go
@@ -5,10 +5,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/gosigar"
 	"github.com/containerd/containerd/osutils"
 	"github.com/rcrowley/go-metrics"
+	"github.com/sirupsen/logrus"
 )
 
 func processMetrics() {

diff --git a/ctr/main.go b/ctr/main.go
@@ -7,10 +7,10 @@ import (
 
 	netcontext "golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
-	"github.com/urfave/cli"
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/api/grpc/types"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
 const usage = `High performance container daemon cli`

diff --git a/hack/benchmark.go b/hack/benchmark.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/api/grpc/types"
+	"github.com/sirupsen/logrus"
 	netcontext "golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

diff --git a/runtime/container.go b/runtime/container.go
@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/specs"
 	ocs "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"
 )

diff --git a/runtime/process.go b/runtime/process.go
@@ -14,9 +14,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/osutils"
 	"github.com/containerd/containerd/specs"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/supervisor/delete.go b/supervisor/delete.go
@@ -3,8 +3,8 @@ package supervisor
 import (
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 )
 
 // DeleteTask holds needed parameters to remove a container

diff --git a/supervisor/exit.go b/supervisor/exit.go
@@ -3,8 +3,8 @@ package supervisor
 import (
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 )
 
 // ExitTask holds needed parameters to execute the exit task

diff --git a/supervisor/monitor_linux.go b/supervisor/monitor_linux.go
@@ -4,9 +4,9 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/archutils"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 )
 
 // NewMonitor starts a new process monitor and returns it

diff --git a/supervisor/monitor_solaris.go b/supervisor/monitor_solaris.go
@@ -37,8 +37,8 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 )
 
 // NewMonitor starts a new process monitor and returns it

diff --git a/supervisor/oom.go b/supervisor/oom.go
@@ -3,7 +3,7 @@ package supervisor
 import (
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // OOMTask holds needed parameters to report a container OOM

diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 )
 
 const (

diff --git a/supervisor/worker.go b/supervisor/worker.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd/runtime"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )
 

diff --git a/vendor.conf b/vendor.conf
@@ -1,4 +1,4 @@
-github.com/Sirupsen/logrus v0.11.2
+github.com/sirupsen/logrus v1.0.1
 github.com/cloudfoundry/gosigar 3ed7c74352dae6dc00bdc8c74045375352e3ec05
 github.com/urfave/cli 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca
 github.com/coreos/go-systemd 7b2428fec40033549c68f54e26e89e7ca9a9ce31

diff --git a/vendor/github.com/Azure/go-ansiterm/parser.go b/vendor/github.com/Azure/go-ansiterm/parser.go
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go b/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
diff --git a/vendor/github.com/docker/docker/pkg/listeners/listeners_unix.go b/vendor/github.com/docker/docker/pkg/listeners/listeners_unix.go
diff --git a/vendor/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/github.com/docker/go-connections/sockets/unix_socket.go
diff --git a/vendor/github.com/Sirupsen/logrus/LICENSE → vendor/github.com/sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE → vendor/github.com/sirupsen/logrus/LICENSE
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,8 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/Sirupsen/logrus"
     	"github.com/containerd/containerd/runtime"
+    	"github.com/sirupsen/logrus"
     )
     const (
@@ Expand Down @@