Procházet zdrojové kódy

cmd/dockerd: initContainerD(): clean-up some logs

Change the log-level for messages about starting the managed containerd instance
to be the same as for the main API. And remove a redundant debug-log.

With this patch:

    dockerd
    INFO[2022-08-11T11:46:32.573299176Z] Starting up
    INFO[2022-08-11T11:46:32.574304409Z] containerd not running, starting managed containerd
    INFO[2022-08-11T11:46:32.575289181Z] started new containerd process                address=/var/run/docker/containerd/containerd.sock module=libcontainerd pid=5370
cmd/dockerd: initContainerD(): clean-up some logs

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn před 3 roky
rodič
revize
6560e0b136

+ 1 - 2
cmd/dockerd/daemon_unix.go

@@ -140,7 +140,7 @@ func (cli *DaemonCli) initContainerD(ctx context.Context) (func(time.Duration) e
 			return nil, errors.Wrap(err, "could not determine whether the system containerd is running")
 		}
 		if !ok {
-			logrus.Debug("Containerd not running, starting daemon managed containerd")
+			logrus.Info("containerd not running, starting managed containerd")
 			opts, err := cli.getContainerdDaemonOpts()
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to generate containerd options")
@@ -150,7 +150,6 @@ func (cli *DaemonCli) initContainerD(ctx context.Context) (func(time.Duration) e
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to start containerd")
 			}
-			logrus.Debug("Started daemon managed containerd")
 			cli.Config.ContainerdAddr = r.Address()
 
 			// Try to wait for containerd to shutdown

+ 1 - 1
libcontainerd/supervisor/remote_daemon.go

@@ -225,7 +225,7 @@ func (r *remote) startContainerd() error {
 		return errors.Wrap(err, "libcontainerd: failed to save daemon pid to disk")
 	}
 
-	r.logger.WithField("pid", r.daemonPid).Infof("started new %s process", binaryName)
+	r.logger.WithField("pid", r.daemonPid).WithField("address", r.Address()).Infof("started new %s process", binaryName)
 
 	return nil
 }