Merge pull request #552 from floreks/logs-inconsistency-fix

bryk · bryk · commit d061979c21aa · 2016-03-21T12:06:27.000+01:00
Fix logs view inconsistency between different k8s versions
diff --git a/src/app/backend/logs.go b/src/app/backend/logs.go
@@ -81,7 +81,7 @@ func getRawPodLogs(client *client.Client, namespace, podID string, logOptions *a
 
 	readCloser, err := req.Stream()
 	if err != nil {
-		return "", err
+		return err.Error(), nil
 	}
 
 	defer readCloser.Close()

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func getRawPodLogs(client client.Client, namespace, podID string, logOptions a`
`81`	`81`
`82`	`82`	`readCloser, err := req.Stream()`
`83`	`83`	`if err != nil {`
`84`		`- return "", err`
	`84`	`+ return err.Error(), nil`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`defer readCloser.Close()`