Skip journald bad message. (#2928)

Unfortunatelly I can't show the message itself without forking the library we are using. Fixes #2812. Signed-off-by: Cyril Tovena <[email protected]>
grafana · Nov 17, 2020 · 58f8117 · 58f8117
1 parent 78bb4bc
commit 58f8117
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/pkg/promtail/targets/journal/journaltarget.go b/pkg/promtail/targets/journal/journaltarget.go
@@ -180,9 +180,14 @@ func journalTargetWithReader(
 	}
 
 	go func() {
-		err := t.r.Follow(until, ioutil.Discard)
-		if err != nil && err != sdjournal.ErrExpired {
-			level.Error(t.logger).Log("msg", "received error during sdjournal follow", "err", err.Error())
+		for {
+			err := t.r.Follow(until, ioutil.Discard)
+			if err != nil {
+				if err == sdjournal.ErrExpired || err == io.EOF {
+					return
+				}
+				level.Error(t.logger).Log("msg", "received error during sdjournal follow", "err", err.Error())
+			}
 		}
 	}()