Browse Source

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

Logentries line-only logopt fix to maintain backwards compatibility
Victor Vieux 7 years ago
parent
commit
3a9ab941ad
1 changed files with 4 additions and 2 deletions
  1. 4 2
      daemon/logger/logentries/logentries.go

+ 4 - 2
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")
 		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 {
-		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{
 	return &logentries{
 		containerID:   info.ContainerID,
 		containerID:   info.ContainerID,