Skip to content

Commit 549dbe0

Browse files
Remove redundant log function
Bump logrus so that we can use logrus.StandardLogger().Logf instead Co-authored-by: Julia Nedialkova <[email protected]>
1 parent b64b958 commit 549dbe0

24 files changed

+892
-529
lines changed

libcontainer/logs/logs.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,7 @@ func processEntry(text []byte) {
6060
logrus.Errorf("failed to parse log level %q: %v\n", jl.Level, err)
6161
return
6262
}
63-
log(lvl, jl.Msg)
64-
}
65-
66-
func log(level logrus.Level, args ...interface{}) {
67-
switch level {
68-
case logrus.PanicLevel:
69-
logrus.Panic(args...)
70-
case logrus.FatalLevel:
71-
logrus.Fatal(args...)
72-
case logrus.ErrorLevel:
73-
logrus.Error(args...)
74-
case logrus.WarnLevel:
75-
logrus.Warn(args...)
76-
case logrus.InfoLevel:
77-
logrus.Info(args...)
78-
case logrus.DebugLevel:
79-
logrus.Debug(args...)
80-
default:
81-
logrus.Warnf("Unsupported log level %v while trying to log '%#v'", level, args)
82-
}
63+
logrus.StandardLogger().Logf(lvl, jl.Msg)
8364
}
8465

8566
func ConfigureLogging(config Config) error {

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ github.com/checkpoint-restore/go-criu v3.11
77
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
88
github.com/opencontainers/selinux v1.2.1
99
github.com/seccomp/libseccomp-golang 84e90a91acea0f4e51e62bc1a75de18b1fc0790f
10-
github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac
10+
github.com/sirupsen/logrus 8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f
1111
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
1212
github.com/vishvananda/netlink 1e2e08e8a2dcdacaae3f14ac44c5cfa31361f270
1313
# systemd integration.

vendor/github.com/sirupsen/logrus/README.md

Lines changed: 44 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/sirupsen/logrus/alt_exit.go

Lines changed: 15 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)