diff --git a/cmd/cri-containerd/cri_containerd.go b/cmd/cri-containerd/cri_containerd.go index 677feb21d..9b40cda19 100644 --- a/cmd/cri-containerd/cri_containerd.go +++ b/cmd/cri-containerd/cri_containerd.go @@ -28,6 +28,7 @@ import ( "syscall" "github.com/containerd/cgroups" + "github.com/containerd/containerd/log" "github.com/containerd/containerd/sys" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/util/interrupt" "github.com/containerd/cri-containerd/cmd/cri-containerd/options" - "github.com/containerd/cri-containerd/pkg/log" "github.com/containerd/cri-containerd/pkg/server" "github.com/containerd/cri-containerd/pkg/version" ) diff --git a/pkg/log/log.go b/pkg/log/log.go index 4035c0f14..ec1d91559 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -16,31 +16,14 @@ limitations under the License. package log -import "github.com/sirupsen/logrus" - -// TODO(random-liu): Add trace support in containerd. - -// TraceLevel is the log level for trace. -const TraceLevel = logrus.Level(uint32(logrus.DebugLevel + 1)) - -// ParseLevel takes a string level and returns the Logrus log level constant. -func ParseLevel(lvl string) (logrus.Level, error) { - if lvl == "trace" { - return TraceLevel, nil - } - return logrus.ParseLevel(lvl) -} +import "github.com/containerd/containerd/log" // Trace logs a message at level Trace on the standard logger. func Trace(args ...interface{}) { - if logrus.GetLevel() >= TraceLevel { - logrus.Debug(args...) - } + log.Trace(log.L, args...) } // Tracef logs a message at level Trace on the standard logger. func Tracef(format string, args ...interface{}) { - if logrus.GetLevel() >= TraceLevel { - logrus.Debugf(format, args...) - } + log.Tracef(log.L, format, args...) }