Merge pull request #1192 from shangmin-001/shangmin03

logkit tailx采集rotate日志丢数据

Author: redHJ

mgr/dataflow_test.go

@@ -679,7 +679,7 @@ func Test_RawData_MultiLines(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"abc\n", "abc\n"}, actual)
 
-	readConfig[readerconf.KeyRawDataTimeout] = "40"
+	readConfig[readerconf.KeyRawDataTimeout] = "60"
 	os.RemoveAll(fileName)
 	createRawDataFile(fileName, "abc\n")
 	actual, err = RawData(readConfig)

reader/singlefile/singlefile.go

@@ -274,6 +274,16 @@ func (sf *SingleFile) Reopen() (err error) {
 	if newInode == oldInode {
 		return
 	}
+
+	endOffset, err := sf.f.Seek(0, io.SeekEnd)
+	if err != nil {
+		log.Errorf("Runner[%v] get file end offset , error: %v", sf.meta.RunnerName, err)
+	} else if endOffset > sf.offset {
+		if _, err = sf.f.Seek(sf.offset, io.SeekStart); err == nil {
+			return
+		}
+		log.Errorf("Runner[%v] set current offset  , error: %v", sf.meta.RunnerName, err)
+	}
 	sf.f.Close()
 	sf.f = nil
 	detectStr := sf.detectMovedName(oldInode)