From 37f4c36c32a9383f6c5f524a4a23f6e9f06e674e Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Mon, 29 Jun 2020 10:50:53 +0200 Subject: [PATCH] Use logrus for logging, not containerd's log --- go.mod | 2 +- server/proxy/streams.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index af72f4f01..50538883f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 github.com/compose-spec/compose-go v0.0.0-20200423124427-63dcf8c22cae github.com/containerd/console v1.0.0 - github.com/containerd/containerd v1.3.5 + github.com/containerd/containerd v1.3.5 // indirect github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8 github.com/docker/distribution v2.7.1+incompatible // indirect diff --git a/server/proxy/streams.go b/server/proxy/streams.go index ff0781431..fd2bff81c 100644 --- a/server/proxy/streams.go +++ b/server/proxy/streams.go @@ -17,8 +17,8 @@ package proxy import ( - "github.com/containerd/containerd/log" "github.com/google/uuid" + "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" streamsv1 "github.com/docker/api/protos/streams/v1" @@ -58,7 +58,7 @@ func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error { case err := <-errc: return err case <-ctx.Done(): - log.G(ctx).Debug("client context canceled") + logrus.Debug("client context canceled") return ctx.Err() } }