kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

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

Logentries line-only logopt fix to maintain backwards compatibility
This commit is contained in:
Victor Vieux 2017-11-30 15:48:56 -08:00 committed by GitHub
parent 3eb7314519 27a5b878c1
commit 3a9ab941ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/logger/logentries/logentries.go
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,