Use io.ReadFull to ensure full content is read when checking position hash

pib · pib · commit e4a8c04fa78d · 2015-10-23T14:20:32.000-05:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -84,6 +84,9 @@ Bug Handling
 * Fixed panic that was occurring when loading a config file or directory that
   exists but which registers no plugins (#1597).
 
+* Fixed bug where LogStreamerInput would sometimes loop infinitely reading the
+  same file over and over when reading gzipped log files.
+
 0.10.0b1 (2015-08-07)
 =====================
 
diff --git a/logstreamer/reader.go b/logstreamer/reader.go
@@ -410,7 +410,7 @@ func SeekInFile(path string, position *LogstreamLocation) (*os.File, io.Reader,
 		expectedN int64
 	)
 	if seekPos >= 0 {
-		n, err = reader.Read(buf)
+		n, err = io.ReadFull(reader, buf)
 		expectedN = int64(LINEBUFFERLEN)
 	} else {
 		n, err = reader.Read(buf[-seekPos:])

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ func SeekInFile(path string, position LogstreamLocation) (os.File, io.Reader,`
`410`	`410`	`expectedN int64`
`411`	`411`	`)`
`412`	`412`	`if seekPos >= 0 {`
`413`		`- n, err = reader.Read(buf)`
	`413`	`+ n, err = io.ReadFull(reader, buf)`
`414`	`414`	`expectedN = int64(LINEBUFFERLEN)`
`415`	`415`	`} else {`
`416`	`416`	`n, err = reader.Read(buf[-seekPos:])`