From a1956b5623fad186ad39ae8aca998284003b0cd3 Mon Sep 17 00:00:00 2001 From: Cody Roseborough Date: Fri, 2 Mar 2018 20:05:28 +0000 Subject: [PATCH] daemon/logger/ring.go: log error not instance Log the error returned from logdriver.Log() instead of the logdriver itself. Signed-off-by: Cody Roseborough --- daemon/logger/ring.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/daemon/logger/ring.go b/daemon/logger/ring.go index e940c62dac..887f2ea18a 100644 --- a/daemon/logger/ring.go +++ b/daemon/logger/ring.go @@ -93,7 +93,10 @@ func (r *RingLogger) Close() error { } if err := r.l.Log(msg); err != nil { - logrus.WithField("driver", r.l.Name()).WithField("container", r.logInfo.ContainerID).Errorf("Error writing log message: %v", r.l) + logrus.WithField("driver", r.l.Name()). + WithField("container", r.logInfo.ContainerID). + WithError(err). + Errorf("Error writing log message") logErr = true } } @@ -114,7 +117,10 @@ func (r *RingLogger) run() { return } if err := r.l.Log(msg); err != nil { - logrus.WithField("driver", r.l.Name()).WithField("container", r.logInfo.ContainerID).Errorf("Error writing log message: %v", r.l) + logrus.WithField("driver", r.l.Name()). + WithField("container", r.logInfo.ContainerID). + WithError(err). + Errorf("Error writing log message") } } }