Remove single newline from the line before printing. (#2235)

Lines are printed with Println, so this avoids having extra empty line between printed log lines. Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
grafana · Jun 18, 2020 · 9bf1130 · 9bf1130
1 parent 4dd7a6c
commit 9bf1130
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/pkg/logcli/output/raw.go b/pkg/logcli/output/raw.go
@@ -13,5 +13,8 @@ type RawOutput struct {
 
 // Format a log entry as is
 func (o *RawOutput) Format(ts time.Time, lbls loghttp.LabelSet, maxLabelsLen int, line string) string {
+	if len(line) > 0 && line[len(line)-1] == '\n' {
+		line = line[:len(line)-1]
+	}
 	return line
 }
diff --git a/pkg/logcli/output/raw_test.go b/pkg/logcli/output/raw_test.go
@@ -41,6 +41,22 @@ func TestRawOutput_Format(t *testing.T) {
 			"Hello world",
 			"Hello world",
 		},
+		"line with single newline at the end": {
+			&LogOutputOptions{Timezone: time.UTC, NoLabels: false},
+			timestamp,
+			someLabels,
+			0,
+			"Hello world\n",
+			"Hello world",
+		},
+		"line with multiple newlines at the end": {
+			&LogOutputOptions{Timezone: time.UTC, NoLabels: false},
+			timestamp,
+			someLabels,
+			0,
+			"Hello world\n\n\n",
+			"Hello world\n\n",
+		},
 	}
 
 	for testName, testData := range tests {