WIP

Author: lfittl

input/system/planetscale/logs.go

@@ -197,6 +197,7 @@ func DownloadLogFiles(ctx context.Context, server *state.Server, logger *util.Lo
 	var newestTimestamp time.Time
 	var sizeLimitReached bool
 	since := psl.PlanetScale.LastTimestamp
+	// Initialize since to 2 minutes ago
 
 	for {
 		logReader, err := QueryLogs(
@@ -217,7 +218,7 @@ func DownloadLogFiles(ctx context.Context, server *state.Server, logger *util.Lo
 
 		count := 0
 		for {
-			entry, err := logReader.Read()
+			msg, err := logReader.ReadString('\n')
 			if err == io.EOF {
 				break
 			}
@@ -226,11 +227,6 @@ func DownloadLogFiles(ctx context.Context, server *state.Server, logger *util.Lo
 				return psl, nil, nil, fmt.Errorf("failed to read log entry: %w", err)
 			}
 
-			msg := entry.Msg
-			if !strings.HasSuffix(msg, "\n") {
-				msg += "\n"
-			}
-
 			newContent := []byte(msg)
 			if len(newContent) > maxLogParsingSize {
 				content = newContent[len(newContent)-maxLogParsingSize:]
@@ -239,7 +235,7 @@ func DownloadLogFiles(ctx context.Context, server *state.Server, logger *util.Lo
 				if overflow > 0 {
 					if !sizeLimitReached {
 						sizeLimitReached = true
-						logger.PrintWarning("PlanetScale: Log data exceeds %d bytes, discarding older data", maxLogParsingSize)
+						logger.PrintWarning("PlanetScale: Log data exceeds %d MB in interval, discarding older data", maxLogParsingSize / 1024 / 1024)
 					}
 					content = content[overflow:]
 				}

logs/parse.go

@@ -461,7 +461,7 @@ func ParseAndAnalyzeBuffer(logStream LineReader, linesNewerThan time.Time, serve
 
 		// Ignore loglines which are outside our time window
 		if logLine.OccurredAt.Before(linesNewerThan) {
-			// if very verbose emit a warning here
+			//fmt.Printf("Skipping line because its outside the specified time window (%s < %s)", logLine.OccurredAt, linesNewerThan)
 			continue
 		}