beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46573 from cpuguy83/double_trace_logs

Browse source 
Remove duplicated trace logs
This commit is contained in:
Sebastiaan van Stijn 2023-10-01 06:50:29 +02:00 committed by GitHub
commit 591c98cdbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/dockerd/daemon.go
View file

@ -57,7 +57,6 @@ import (
"github.com/docker/docker/runconfig"
"github.com/docker/go-connections/tlsconfig"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/tracing/detect"
swarmapi "github.com/moby/swarmkit/v2/api"
"github.com/pkg/errors"
@ -247,7 +246,6 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
} else {
otel.SetTracerProvider(tp)
log.G(ctx).Logger.AddHook(tracing.NewLogrusHook())
bklog.G(ctx).Logger.AddHook(tracing.NewLogrusHook())
}
pluginStore := plugin.NewStore()