toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35628 from ikarpovich/35626-le-line-only-legacy

Browse Source 
Logentries line-only logopt fix to maintain backwards compatibility
Upstream-commit: 3a9ab941adcc7a39c3ea8c52e3c215cdddb2fe67
Component: engine
This commit is contained in:
Victor Vieux
2017-11-30 15:48:56 -08:00
committed by GitHub
parent f67476ad43 c4cb5e12ad
commit b611814dc6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/logger/logentries/logentries.go
+4 -2
View File
@@ -50,8 +50,10 @@ func New(info logger.Info) (logger.Logger, error) {
return nil, errors.Wrap(err, "error connecting to logentries")
}
var lineOnly bool
if lineOnly, err = strconv.ParseBool(info.Config[lineonly]); err != nil {
return nil, errors.Wrap(err, "error parsing lineonly option")
if info.Config[lineonly] != "" {
if lineOnly, err = strconv.ParseBool(info.Config[lineonly]); err != nil {
return nil, errors.Wrap(err, "error parsing lineonly option")
}
}
return &logentries{
containerID: info.ContainerID,