check if file is inactive every 5 minutes

elastic · Oct 2, 2020 · 850916c · 850916c
1 parent 082f12b
commit 850916c
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/filebeat/input/filestream/filestream.go b/filebeat/input/filestream/filestream.go
@@ -151,6 +151,8 @@ func (f *logFile) startFileMonitoringIfNeeded() {
 
 func (f *logFile) closeIfTimeout(ctx unison.Canceler) {
 	timer := time.NewTimer(f.closeAfterInterval)
+	defer timer.Stop()
+
 	for {
 		select {
 		case <-ctx.Done():
@@ -163,12 +165,21 @@ func (f *logFile) closeIfTimeout(ctx unison.Canceler) {
 }
 
 func (f *logFile) closeIfInactive(ctx unison.Canceler) {
-	// TODO it can be optimized
-	for ctx.Err() == nil {
-		age := time.Since(f.lastTimeRead)
-		if age > f.closeInactive {
-			f.cancelReading()
+	// This can be made configureble if users need a more flexible
+	// cheking for inactive files.
+	ticker := time.NewTicker(5 * time.Minute)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
 			return
+		case <-ticker.C:
+			age := time.Since(f.lastTimeRead)
+			if age > f.closeInactive {
+				f.cancelReading()
+				return
+			}
 		}
 	}
 }