Merge pull request #4442 from mboersma/fix-apps-logs-panic

fix(client): print logs that lack a category prefix

Author: mboersma

client/cmd/apps.go

@@ -158,10 +158,19 @@ func AppLogs(appID string, lines int) error {
 		return err
 	}
 
+	return printLogs(logs)
+}
+
+// printLogs prints each log line with a color matched to its category.
+func printLogs(logs string) error {
 	for _, log := range strings.Split(strings.Trim(logs, `\n`), `\n`) {
-		catagory := strings.Split(strings.Split(log, ": ")[0], " ")[1]
+		category := "unknown"
+		parts := strings.Split(strings.Split(log, ": ")[0], " ")
+		if len(parts) >= 2 {
+			category = parts[1]
+		}
 		colorVars := map[string]string{
-			"Color": chooseColor(catagory),
+			"Color": chooseColor(category),
 			"Log":   log,
 		}
 		fmt.Println(prettyprint.ColorizeVars("{{.V.Color}}{{.V.Log}}{{.C.Default}}", colorVars))

client/cmd/apps_test.go

@@ -0,0 +1,18 @@
+package cmd
+
+import "testing"
+
+func TestPrintLogLinesBadLine(t *testing.T) {
+	t.Parallel()
+
+	// Regression test for https://github.com/deis/deis/issues/4420
+	logs := `\nDone preparing production files\n\n\u001b[4mRunning \"concat:plugins\" (concat) task\u001b[24m\n`
+	if err := printLogs(logs); err != nil {
+		t.Fatal(err)
+	}
+
+	logs = `\n\n\n`
+	if err := printLogs(logs); err != nil {
+		t.Fatal(err)
+	}
+}