InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch all logging to use containerd log pkg

Browse Source 
This unifies our logging and allows us to propagate logging and trace
contexts together.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff
2023-06-23 00:33:17 +00:00
parent 8d070e30f5
commit 74da6a6363
304 changed files with 2062 additions and 1826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/logs.go
View File

@@ -5,6 +5,7 @@ import (
"strconv"
"time"
"github.com/containerd/containerd/log"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend"
containertypes "github.com/docker/docker/api/types/container"
@@ -25,7 +26,7 @@ import (
// if it returns nil, the config channel will be active and return log
// messages until it runs out or the context is canceled.
func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, config *types.ContainerLogsOptions) (messages <-chan *backend.LogMessage, isTTY bool, retErr error) {
lg := logrus.WithFields(logrus.Fields{
lg := log.G(ctx).WithFields(logrus.Fields{
"module": "daemon",
"method": "(*Daemon).ContainerLogs",
"container": containerName,
@@ -55,7 +56,7 @@ func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, c
defer func() {
if retErr != nil {
if err = cLog.Close(); err != nil {
logrus.Errorf("Error closing logger: %v", err)
log.G(ctx).Errorf("Error closing logger: %v", err)
}
}
}()
@@ -108,7 +109,7 @@ func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, c
if cLogCreated {
defer func() {
if err = cLog.Close(); err != nil {
logrus.Errorf("Error closing logger: %v", err)
log.G(ctx).Errorf("Error closing logger: %v", err)
}
}()
}