kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
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
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") return nil, errors.Wrap(err, "error connecting to logentries")
} }
var lineOnly bool var lineOnly bool
if lineOnly, err = strconv.ParseBool(info.Config[lineonly]); err != nil { if info.Config[lineonly] != "" {
return nil, errors.Wrap(err, "error parsing lineonly option") if lineOnly, err = strconv.ParseBool(info.Config[lineonly]); err != nil {
return nil, errors.Wrap(err, "error parsing lineonly option")
}
} }
return &logentries{ return &logentries{
containerID: info.ContainerID, containerID: info.ContainerID,