From d917723331c090d5003b70decda7f80bf123f966 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 11 Jun 2016 15:37:36 -0700 Subject: [PATCH] Fix incorrect usage of logrus when formatting string is present This fix tries to fix logrus formatting by adding `f` to the end of `logrus.[Error|Warn|Debug|Fatal|Panic|Info](` when formatting string is present but the function `logrus.[Error|Warn|Debug|Fatal|Panic|Info](` is used (incorrectly). This fix is related to #23459, and is a follow up of #23461. Signed-off-by: Yong Tang --- daemon/daemon_unix.go | 2 +- integration-cli/events_utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 517c423807..3ef3ec1338 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -362,7 +362,7 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi } if resources.CPUPercent > 0 { warnings = append(warnings, "%s does not support CPU percent. Percent discarded.", runtime.GOOS) - logrus.Warn("%s does not support CPU percent. Percent discarded.", runtime.GOOS) + logrus.Warnf("%s does not support CPU percent. Percent discarded.", runtime.GOOS) resources.CPUPercent = 0 } diff --git a/integration-cli/events_utils.go b/integration-cli/events_utils.go index 8aa139c03f..d0863154b6 100644 --- a/integration-cli/events_utils.go +++ b/integration-cli/events_utils.go @@ -89,7 +89,7 @@ func (e *eventObserver) Match(match eventMatcher, process eventMatchProcessor) { err = io.EOF } - logrus.Debug("EventObserver scanner loop finished: %v", err) + logrus.Debugf("EventObserver scanner loop finished: %v", err) e.disconnectionError = err }