From 27a5b878c149fd70ca1e0beebda58edcc19abc73 Mon Sep 17 00:00:00 2001 From: Igor Karpovich Date: Thu, 30 Nov 2017 13:03:16 +0000 Subject: [PATCH] Logentries line-only logopt fix to maintain backwards compatibility Changed logic to ignore empty value Fixes #35626 Signed-off-by: Igor Karpovich --- daemon/logger/logentries/logentries.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/logger/logentries/logentries.go b/daemon/logger/logentries/logentries.go index 1d25843e8c..255e87d4b7 100644 --- a/daemon/logger/logentries/logentries.go +++ b/daemon/logger/logentries/logentries.go @@ -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,