Skip to content

Commit 05f40e3

Browse files
committed
Merge pull request #349 from jchauncey/issue-267
fix(logger): Try not to fail so hard when issuing deis logs command
2 parents 4b8b388 + 69a1db1 commit 05f40e3

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

  • client/controller/models/apps

client/controller/models/apps/apps.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,12 @@ func Logs(c *client.Client, appID string, lines int) (string, error) {
9797

9898
body, err := c.BasicRequest("GET", u, nil)
9999

100-
if err != nil {
101-
return fmt.Sprintf("Error:%v", err), err
102-
}
103-
104-
if len(body) < 1 {
100+
if err != nil || len(body) < 1 {
105101
return fmt.Sprintf(
106102
`There are currently no log messages. Please check the following things:
107103
1) Logger and fluentd pods are running.
108-
2) The application is writing logs to the logger component.
104+
2) If you just installed the logger components via the chart, please make sure you restarted the workflow pod.
105+
3) The application is writing logs to the logger component.
109106
You can verify that logs are appearing in the logger component by issuing the following command:
110107
curl http://<log service ip>:8088/%s on a kubernetes host.
111108
To get the service ip you can do the following: kubectl get svc deis-logger --namespace=deis`, appID), nil

0 commit comments

Comments
 (0)