Print warnings on unparseable log file entries.

rapidloop · Jul 21, 2023 · a3211c6 · a3211c6
1 parent 4e96ee6
commit a3211c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/collector/collect.go b/collector/collect.go
@@ -3143,7 +3143,9 @@ func (c *collector) collectFromRDS(o CollectConfig) {
 		start := time.Now().Add(-window)
 
 		err = ac.collectLogs(dbid, start, func(lines []byte) {
-			c.processLogBuf(start, lines)
+			if err := c.processLogBuf(start, lines); err != nil {
+				log.Printf("warning: %v", err)
+			}
 		})
 	}
 }

diff --git a/collector/log.go b/collector/log.go
@@ -136,12 +136,10 @@ func (c *collector) processLogBuf(start time.Time, bigbuf []byte) (err error) {
 	count := 0
 	pos := c.rxPrefix.FindIndex(bigbuf)
 	for len(pos) == 2 && len(bigbuf) > 0 {
-		// match again for submatches, can't do this in one go :-(
-		// TODO: no longer the case, use FindSubmatchIndex
 		match := c.rxPrefix.FindSubmatch(bigbuf[pos[0]:])
 		t, user, db, qid, err := getMatchData(match, c.rxPrefix)
 		if err != nil {
-			return nil
+			return err
 		}
 		var line string
 		// seek to start of next line