Permalink
Browse files

Updated logrus to v1

Updated logrus to use v1 which includes a breaking name change Sirupsen -> sirupsen.

This includes a manual edit of the docker term package to also correct the name there too.

Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk>
  • Loading branch information...
stevenh committed Jul 19, 2017
1 parent 5b995d9 commit ee4f68e302c63b655c1f25dbfbb84c0464335b0c
Showing with 1,653 additions and 1,108 deletions.
  1. +2 −1 events.go
  2. +2 −1 libcontainer/cgroups/fs/stats_util_test.go
  3. +2 −1 libcontainer/configs/config.go
  4. +4 −4 libcontainer/container_linux.go
  5. +2 −2 libcontainer/init_linux.go
  6. +1 −1 libcontainer/integration/execin_test.go
  7. +2 −1 libcontainer/integration/init_test.go
  8. +1 −1 libcontainer/state_linux.go
  9. +2 −1 main.go
  10. +2 −1 notify_socket.go
  11. +1 −1 signals.go
  12. +2 −1 utils.go
  13. +3 −3 utils_linux.go
  14. +1 −1 vendor.conf
  15. +0 −349 vendor/github.com/Sirupsen/logrus/README.md
  16. +0 −40 vendor/github.com/Sirupsen/logrus/json_formatter.go
  17. +0 −203 vendor/github.com/Sirupsen/logrus/logger.go
  18. +0 −12 vendor/github.com/Sirupsen/logrus/terminal_darwin.go
  19. +0 −20 vendor/github.com/Sirupsen/logrus/terminal_freebsd.go
  20. +0 −21 vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
  21. +0 −27 vendor/github.com/Sirupsen/logrus/terminal_windows.go
  22. +0 −149 vendor/github.com/Sirupsen/logrus/text_formatter.go
  23. +0 −31 vendor/github.com/Sirupsen/logrus/writer.go
  24. +1 −1 vendor/github.com/docker/docker/pkg/term/term_windows.go
  25. +1 −1 vendor/github.com/docker/docker/pkg/term/winconsole/console_windows.go
  26. +109 −0 vendor/github.com/sirupsen/logrus/CHANGELOG.md
  27. 0 vendor/github.com/{Sirupsen → sirupsen}/logrus/LICENSE
  28. +504 −0 vendor/github.com/sirupsen/logrus/README.md
  29. +64 −0 vendor/github.com/sirupsen/logrus/alt_exit.go
  30. +26 −0 vendor/github.com/sirupsen/logrus/doc.go
  31. +65 −42 vendor/github.com/{Sirupsen → sirupsen}/logrus/entry.go
  32. +7 −2 vendor/github.com/{Sirupsen → sirupsen}/logrus/exported.go
  33. +6 −9 vendor/github.com/{Sirupsen → sirupsen}/logrus/formatter.go
  34. +3 −3 vendor/github.com/{Sirupsen → sirupsen}/logrus/hooks.go
  35. +74 −0 vendor/github.com/sirupsen/logrus/json_formatter.go
  36. +317 −0 vendor/github.com/sirupsen/logrus/logger.go
  37. +52 −3 vendor/github.com/{Sirupsen → sirupsen}/logrus/logrus.go
  38. +10 −0 vendor/github.com/sirupsen/logrus/terminal_appengine.go
  39. +3 −0 vendor/github.com/{Sirupsen/logrus/terminal_openbsd.go → sirupsen/logrus/terminal_bsd.go}
  40. +2 −0 vendor/github.com/{Sirupsen → sirupsen}/logrus/terminal_linux.go
  41. +28 −0 vendor/github.com/sirupsen/logrus/terminal_notwindows.go
  42. +21 −0 vendor/github.com/sirupsen/logrus/terminal_solaris.go
  43. +82 −0 vendor/github.com/sirupsen/logrus/terminal_windows.go
  44. +189 −0 vendor/github.com/sirupsen/logrus/text_formatter.go
  45. +62 −0 vendor/github.com/sirupsen/logrus/writer.go
  46. +0 −83 vendor/github.com/syndtr/gocapability/capability/capability_test.go
  47. +0 −92 vendor/github.com/syndtr/gocapability/capability/enumgen/gen.go
View
@@ -9,9 +9,10 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
@@ -6,8 +6,9 @@ import (
"fmt"
"testing"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/sirupsen/logrus"
)
func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error {
@@ -7,8 +7,9 @@ import (
"os/exec"
"time"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
)
type Rlimit struct {
@@ -18,17 +18,17 @@ import (
"syscall" // only for SysProcAttr and Signal
"time"
"golang.org/x/sys/unix"
"github.com/Sirupsen/logrus"
"github.com/golang/protobuf/proto"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/criurpc"
"github.com/opencontainers/runc/libcontainer/system"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/golang/protobuf/proto"
"github.com/sirupsen/logrus"
"github.com/syndtr/gocapability/capability"
"github.com/vishvananda/netlink/nl"
"golang.org/x/sys/unix"
)
const stdioFdCount = 3
@@ -12,14 +12,14 @@ import (
"syscall" // only for Errno
"unsafe"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/system"
"github.com/opencontainers/runc/libcontainer/user"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/vishvananda/netlink"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
)
@@ -234,7 +234,7 @@ func TestExecInError(t *testing.T) {
Cwd: "/",
Args: []string{"unexistent"},
Env: standardEnvironment,
Stdout: &out,
Stderr: &out,
}
err = container.Run(unexistent)
if err == nil {
@@ -5,10 +5,11 @@ import (
"runtime"
"testing"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
_ "github.com/opencontainers/runc/libcontainer/nsenter"
"github.com/sirupsen/logrus"
)
// init runs the libcontainer initialization code because of the busybox style needs
@@ -7,10 +7,10 @@ import (
"os"
"path/filepath"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
View
@@ -6,8 +6,9 @@ import (
"os"
"strings"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
View
@@ -8,8 +8,9 @@ import (
"net"
"path/filepath"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
View
@@ -7,11 +7,11 @@ import (
"os/signal"
"syscall" // only for Signal
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/system"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
View
@@ -5,8 +5,9 @@ import (
"os"
"path/filepath"
"github.com/Sirupsen/logrus"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
View
@@ -10,16 +10,16 @@ import (
"path/filepath"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/activation"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/specconv"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
"github.com/coreos/go-systemd/activation"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"golang.org/x/sys/unix"
)
View
@@ -6,7 +6,7 @@ github.com/opencontainers/runtime-spec 96de01bbb42c7af89bff100e10a9f0fb62e75bfb
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
github.com/opencontainers/selinux v1.0.0-rc1
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
github.com/vishvananda/netlink 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270
# systemd integration.
Oops, something went wrong.

0 comments on commit ee4f68e

Please sign in to comment.