diff --git a/pkg/shim/shim.go b/pkg/shim/shim.go index e4959240f..b8a28acd6 100644 --- a/pkg/shim/shim.go +++ b/pkg/shim/shim.go @@ -43,7 +43,6 @@ import ( "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/containerd/ttrpc" - "github.com/sirupsen/logrus" ) // Publisher for events @@ -171,12 +170,9 @@ func setRuntime() { func setLogger(ctx context.Context, id string) (context.Context, error) { l := log.G(ctx) - l.Logger.SetFormatter(&logrus.TextFormatter{ - TimestampFormat: log.RFC3339NanoFixed, - FullTimestamp: true, - }) + _ = log.SetFormat(log.TextFormat) if debugFlag { - l.Logger.SetLevel(log.DebugLevel) + _ = log.SetLevel("debug") } f, err := openLog(ctx, id) if err != nil { diff --git a/pkg/shim/shim_unix.go b/pkg/shim/shim_unix.go index dd1e61812..1d3057ca3 100644 --- a/pkg/shim/shim_unix.go +++ b/pkg/shim/shim_unix.go @@ -30,7 +30,6 @@ import ( "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/fifo" "github.com/containerd/log" - "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) @@ -71,7 +70,7 @@ func serveListener(path string) (net.Listener, error) { return l, nil } -func reap(ctx context.Context, logger *logrus.Entry, signals chan os.Signal) error { +func reap(ctx context.Context, logger *log.Entry, signals chan os.Signal) error { logger.Debug("starting signal loop") for { @@ -92,7 +91,7 @@ func reap(ctx context.Context, logger *logrus.Entry, signals chan os.Signal) err } } -func handleExitSignals(ctx context.Context, logger *logrus.Entry, cancel context.CancelFunc) { +func handleExitSignals(ctx context.Context, logger *log.Entry, cancel context.CancelFunc) { ch := make(chan os.Signal, 32) signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM) diff --git a/pkg/shim/shim_windows.go b/pkg/shim/shim_windows.go index 8181b4c81..9ece51aca 100644 --- a/pkg/shim/shim_windows.go +++ b/pkg/shim/shim_windows.go @@ -23,8 +23,8 @@ import ( "os" "github.com/containerd/errdefs" + "github.com/containerd/log" "github.com/containerd/ttrpc" - "github.com/sirupsen/logrus" ) func setupSignals(config Config) (chan os.Signal, error) { @@ -46,11 +46,11 @@ func serveListener(path string) (net.Listener, error) { return nil, errdefs.ErrNotImplemented } -func reap(ctx context.Context, logger *logrus.Entry, signals chan os.Signal) error { +func reap(ctx context.Context, logger *log.Entry, signals chan os.Signal) error { return errdefs.ErrNotImplemented } -func handleExitSignals(ctx context.Context, logger *logrus.Entry, cancel context.CancelFunc) { +func handleExitSignals(ctx context.Context, logger *log.Entry, cancel context.CancelFunc) { } func openLog(ctx context.Context, _ string) (io.Writer, error) {