Skip to content

Commit e775f0f

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request opencontainers#1526 from stevenh/logrus-v1
Updated logrus to v1
2 parents 5951cf5 + ee4f68e commit e775f0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1653
-933
lines changed

‎events.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import (
99
"sync"
1010
"time"
1111

12-
"github.com/Sirupsen/logrus"
1312
"github.com/opencontainers/runc/libcontainer"
1413
"github.com/opencontainers/runc/libcontainer/cgroups"
14+
15+
"github.com/sirupsen/logrus"
1516
"github.com/urfave/cli"
1617
)
1718

‎libcontainer/cgroups/fs/stats_util_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/Sirupsen/logrus"
109
"github.com/opencontainers/runc/libcontainer/cgroups"
10+
11+
"github.com/sirupsen/logrus"
1112
)
1213

1314
func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error {

‎libcontainer/configs/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import (
77
"os/exec"
88
"time"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/opencontainers/runtime-spec/specs-go"
11+
12+
"github.com/sirupsen/logrus"
1213
)
1314

1415
type Rlimit struct {

‎libcontainer/container_linux.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ import (
1818
"syscall" // only for SysProcAttr and Signal
1919
"time"
2020

21-
"golang.org/x/sys/unix"
22-
23-
"github.com/Sirupsen/logrus"
24-
"github.com/golang/protobuf/proto"
2521
"github.com/opencontainers/runc/libcontainer/cgroups"
2622
"github.com/opencontainers/runc/libcontainer/configs"
2723
"github.com/opencontainers/runc/libcontainer/criurpc"
2824
"github.com/opencontainers/runc/libcontainer/system"
2925
"github.com/opencontainers/runc/libcontainer/utils"
26+
27+
"github.com/golang/protobuf/proto"
28+
"github.com/sirupsen/logrus"
3029
"github.com/syndtr/gocapability/capability"
3130
"github.com/vishvananda/netlink/nl"
31+
"golang.org/x/sys/unix"
3232
)
3333

3434
const stdioFdCount = 3

‎libcontainer/init_linux.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"syscall" // only for Errno
1313
"unsafe"
1414

15-
"github.com/Sirupsen/logrus"
1615
"github.com/opencontainers/runc/libcontainer/cgroups"
1716
"github.com/opencontainers/runc/libcontainer/configs"
1817
"github.com/opencontainers/runc/libcontainer/system"
1918
"github.com/opencontainers/runc/libcontainer/user"
2019
"github.com/opencontainers/runc/libcontainer/utils"
21-
"github.com/vishvananda/netlink"
2220

21+
"github.com/sirupsen/logrus"
22+
"github.com/vishvananda/netlink"
2323
"golang.org/x/sys/unix"
2424
)
2525

‎libcontainer/integration/execin_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func TestExecInError(t *testing.T) {
234234
Cwd: "/",
235235
Args: []string{"unexistent"},
236236
Env: standardEnvironment,
237-
Stdout: &out,
237+
Stderr: &out,
238238
}
239239
err = container.Run(unexistent)
240240
if err == nil {

‎libcontainer/integration/init_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"runtime"
66
"testing"
77

8-
"github.com/Sirupsen/logrus"
98
"github.com/opencontainers/runc/libcontainer"
109
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
1110
_ "github.com/opencontainers/runc/libcontainer/nsenter"
11+
12+
"github.com/sirupsen/logrus"
1213
)
1314

1415
// init runs the libcontainer initialization code because of the busybox style needs

‎libcontainer/state_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"os"
88
"path/filepath"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/opencontainers/runc/libcontainer/configs"
1211
"github.com/opencontainers/runc/libcontainer/utils"
1312

13+
"github.com/sirupsen/logrus"
1414
"golang.org/x/sys/unix"
1515
)
1616

‎main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import (
66
"os"
77
"strings"
88

9-
"github.com/Sirupsen/logrus"
109
"github.com/opencontainers/runtime-spec/specs-go"
10+
11+
"github.com/sirupsen/logrus"
1112
"github.com/urfave/cli"
1213
)
1314

‎notify_socket.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88
"net"
99
"path/filepath"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/opencontainers/runtime-spec/specs-go"
12+
13+
"github.com/sirupsen/logrus"
1314
"github.com/urfave/cli"
1415
)
1516

‎signals.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"os/signal"
88
"syscall" // only for Signal
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/opencontainers/runc/libcontainer"
1211
"github.com/opencontainers/runc/libcontainer/system"
1312
"github.com/opencontainers/runc/libcontainer/utils"
1413

14+
"github.com/sirupsen/logrus"
1515
"golang.org/x/sys/unix"
1616
)
1717

‎utils.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/Sirupsen/logrus"
98
"github.com/opencontainers/runtime-spec/specs-go"
9+
10+
"github.com/sirupsen/logrus"
1011
"github.com/urfave/cli"
1112
)
1213

‎utils_linux.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import (
1010
"path/filepath"
1111
"strconv"
1212

13-
"github.com/Sirupsen/logrus"
14-
"github.com/coreos/go-systemd/activation"
1513
"github.com/opencontainers/runc/libcontainer"
1614
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
1715
"github.com/opencontainers/runc/libcontainer/configs"
1816
"github.com/opencontainers/runc/libcontainer/specconv"
1917
"github.com/opencontainers/runc/libcontainer/utils"
2018
"github.com/opencontainers/runtime-spec/specs-go"
21-
"github.com/urfave/cli"
2219

20+
"github.com/coreos/go-systemd/activation"
21+
"github.com/sirupsen/logrus"
22+
"github.com/urfave/cli"
2323
"golang.org/x/sys/unix"
2424
)
2525

‎vendor.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ github.com/opencontainers/runtime-spec v1.0.0
66
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
77
github.com/opencontainers/selinux v1.0.0-rc1
88
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
9-
github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
9+
github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac
1010
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
1111
github.com/vishvananda/netlink 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270
1212
# systemd integration.

0 commit comments

Comments
 (0)