Bug 1264039: Read all lines even if file does not end in '\n' or EOL

https://bugzilla.redhat.com/show_bug.cgi?id=1264039 Ensure that all lines of a configuration file are read even if the file does not end in a newline character or EOL.
openshift · Sep 21, 2015 · d51d2e0 · d51d2e0
1 parent 1972e43
commit d51d2e0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/logshifter/config.go b/logshifter/config.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bufio"
+	"io"
 	"os"
 	"strconv"
 	"strings"
@@ -34,7 +35,7 @@ const (
 	// output types
 	Syslog = "syslog"
 	File   = "file"
-	Multi = "multi"
+	Multi  = "multi"
 
 	DefaultConfigFile = "/etc/openshift/logshifter.conf"
 )
@@ -62,7 +63,7 @@ func ParseConfig(file string) (*Config, error) {
 
 	for {
 		line, err := reader.ReadString('\n')
-		if err != nil || len(line) == 0 {
+		if (err != nil && err != io.EOF) || len(line) == 0 {
 			break
 		}