Merge pull request #227 from charmbracelet/bugfix/panic-loglines

Kujtim Hoxha created 3 months ago

bugfix: fixup panic for oob range

Change summary

cmd/logs.go | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

Detailed changes

cmd/logs.go

@@ -77,17 +77,13 @@ func followLogs(ctx context.Context, logsFile string, tailLines int) error {
 	}
 
 	var lines []string
-	lineCount := 0
 	for line := range t.Lines {
 		if line.Err != nil {
 			continue
 		}
 		lines = append(lines, line.Text)
-		lineCount++
-		if lineCount >= tailLines {
-			if len(lines) > tailLines {
-				lines = lines[len(lines)-tailLines:]
-			}
+		if len(lines) > tailLines {
+			lines = lines[len(lines)-tailLines:]
 		}
 	}
 	t.Stop()
@@ -138,17 +134,13 @@ func showLogs(logsFile string, tailLines int) error {
 	defer t.Stop()
 
 	var lines []string
-	lineCount := 0
 	for line := range t.Lines {
 		if line.Err != nil {
 			continue
 		}
 		lines = append(lines, line.Text)
-		lineCount++
-		if lineCount >= tailLines {
-			if len(lines) > tailLines {
-				lines = lines[len(lines)-tailLines:]
-			}
+		if len(lines) > tailLines {
+			lines = lines[len(lines)-tailLines:]
 		}
 	}