beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix incorrect usage of logrus when formatting string is present
This commit is contained in:
Vincent Demeester 2016-06-12 10:21:04 +02:00 committed by GitHub
commit 434a46e652
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon_unix.go
View file

@ -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
}

2
integration-cli/events_utils.go
View file

@ -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
}