Browse Source

Merge pull request #23466 from yongtang/23459-logrus-formatting-2

Fix incorrect usage of logrus when formatting string is present
Vincent Demeester 9 years ago
parent
commit
434a46e652
2 changed files with 2 additions and 2 deletions
  1. 1 1
      daemon/daemon_unix.go
  2. 1 1
      integration-cli/events_utils.go

+ 1 - 1
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
 	}
 

+ 1 - 1
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
 }