mute application logs (GoogleContainerTools#6407)

halvards · Aug 11, 2021 · 73d1ec9 · 73d1ec9
1 parent 2664f56
commit 73d1ec9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/pkg/skaffold/kubernetes/logger/formatter.go b/pkg/skaffold/kubernetes/logger/formatter.go
@@ -60,6 +60,9 @@ func newKubernetesLogFormatter(config Config, colorPicker output.ColorPicker, is
 func (k *kubernetesLogFormatter) Name() string { return k.prefix }
 
 func (k *kubernetesLogFormatter) PrintLine(out io.Writer, line string) {
+	if k.isMuted() {
+		return
+	}
 	formattedPrefix := k.prefix
 	if output.IsColorable(out) {
 		formattedPrefix = k.color().Sprintf("%s", k.prefix)
@@ -72,11 +75,9 @@ func (k *kubernetesLogFormatter) PrintLine(out io.Writer, line string) {
 	formattedLine := fmt.Sprintf("%s%s", formattedPrefix, line)
 	eventV2.ApplicationLog(k.pod.Name, k.container.Name, formattedPrefix, line, formattedLine)
 
-	if !k.isMuted() {
-		k.lock.Lock()
-		defer k.lock.Unlock()
-		fmt.Fprint(out, formattedLine)
-	}
+	k.lock.Lock()
+	defer k.lock.Unlock()
+	fmt.Fprint(out, formattedLine)
 }
 
 func (k *kubernetesLogFormatter) color() output.Color {

diff --git a/pkg/skaffold/kubernetes/logger/formatter_test.go b/pkg/skaffold/kubernetes/logger/formatter_test.go
@@ -222,3 +222,32 @@ func TestPrefix(t *testing.T) {
 		})
 	}
 }
+
+func TestPrintline(t *testing.T) {
+	tests := []struct {
+		description string
+		isMuted     bool
+		expected    string
+	}{
+		{
+			description: "muted",
+			isMuted:     true,
+		},
+		{
+			description: "unmuted",
+			expected:    "[hello container]test line",
+		},
+	}
+	for _, test := range tests {
+		testutil.Run(t, test.description, func(t *testutil.T) {
+			pod := podWithName("hello")
+			f := newKubernetesLogFormatter(&mockConfig{log: latestV1.LogsConfig{
+				Prefix: "auto",
+			}}, &mockColorPicker{}, func() bool { return test.isMuted }, &pod,
+				containerWithName("container"))
+			var out bytes.Buffer
+			f.PrintLine(&out, "test line")
+			t.CheckDeepEqual(test.expected, out.String())
+		})
+	}
+}