tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use logrus for logging, not containerd's log

This commit is contained in:
Djordje Lukic 2020-06-29 10:50:53 +02:00
parent 2b5e6f0038
commit 37f4c36c32
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -17,7 +17,7 @@ require (
github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129
github.com/compose-spec/compose-go v0.0.0-20200423124427-63dcf8c22cae github.com/compose-spec/compose-go v0.0.0-20200423124427-63dcf8c22cae
github.com/containerd/console v1.0.0 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/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8 github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8
github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/distribution v2.7.1+incompatible // indirect

4
server/proxy/streams.go
View File

@ -17,8 +17,8 @@
package proxy package proxy
import ( import (
"github.com/containerd/containerd/log"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
streamsv1 "github.com/docker/api/protos/streams/v1" streamsv1 "github.com/docker/api/protos/streams/v1"
@ -58,7 +58,7 @@ func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error {
case err := <-errc: case err := <-errc:
return err return err
case <-ctx.Done(): case <-ctx.Done():
log.G(ctx).Debug("client context canceled") logrus.Debug("client context canceled")
return ctx.Err() return ctx.Err()
} }
} }