Merge pull request containerd#7798 from calvin0327/fix-sdNotify

fix sdNotify func when debug level
mbhavya · Dec 12, 2022 · 5e51347 · 5e51347
2 parents 36641ea + f219f7d
commit 5e51347
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/cmd/containerd/command/notify_linux.go b/cmd/containerd/command/notify_linux.go
@@ -36,10 +36,13 @@ func notifyStopping(ctx context.Context) error {
 
 func sdNotify(ctx context.Context, state string) error {
 	notified, err := sd.SdNotify(false, state)
-	log.G(ctx).
-		WithError(err).
-		WithField("notified", notified).
+	entry := log.G(ctx)
+	if err != nil {
+		entry = entry.WithError(err)
+	}
+	entry.WithField("notified", notified).
 		WithField("state", state).
 		Debug("sd notification")
+
 	return err
 }