feat(logger): Support logger v2

This PR submits the necessary code changes to support the new v2 logger implementation.

Author: Jonathan Chauncey

Makefile

@@ -55,6 +55,10 @@ kube-create-database:
 
 kube-create-all: kube-create-database kube-create
 
+kube-update: update-manifests
+	kubectl delete -f manifests/deis-workflow-rc.tmp.yml
+	kubectl create -f manifests/deis-workflow-rc.tmp.yml
+
 update-manifests:
 	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-workflow-rc.yml \
 		> manifests/deis-workflow-rc.tmp.yml

client/cmd/apps.go

@@ -172,9 +172,9 @@ func AppLogs(appID string, lines int) error {
 
 // 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`) {
+	for _, log := range strings.Split(logs, `\\n\\n`) {
 		category := "unknown"
-		parts := strings.Split(strings.Split(log, ": ")[0], " ")
+		parts := strings.Split(strings.Split(log, " -- ")[0], " ")
 		if len(parts) >= 2 {
 			category = parts[1]
 		}

client/controller/models/apps/apps.go

@@ -98,10 +98,21 @@ func Logs(c *client.Client, appID string, lines int) (string, error) {
 	body, err := c.BasicRequest("GET", u, nil)
 
 	if err != nil {
-		return "", err
+		return fmt.Sprintf("Error:%v", err), err
 	}
 
-	return strings.Trim(body, `"`), nil
+	if len(body) < 1 {
+		return fmt.Sprintf(
+			`There are currently no log messages. Please check the following things:
+1) Logger and fluentd pods are running.
+2) The application is writing logs to the logger component.
+You can verify that logs are appearing in the logger component by issuing the following command:
+curl http://<log service ip>:8088/%s on a kubernetes host.
+To get the service ip you can do the following: kubectl get svc deis-logger --namespace=deis`, appID), nil
+	}
+
+	// We need to trim a few characters off the front and end of the string
+	return body[3 : len(body)-2], nil
 }
 
 // Run one time command in an app.

client/controller/models/apps/apps_test.go

@@ -96,13 +96,17 @@ func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	// The entire log message is prefixed and suffixed with a few characters (not entirely sure why)
+	// We mimic those here
 	if req.URL.Path == "/v2/apps/example-go/logs" && req.URL.RawQuery == "" && req.Method == "GET" {
-		res.Write([]byte("test\nfoo\nbar\n"))
+		res.Write([]byte("b'\"test foo bar\"'"))
 		return
 	}
 
+	// The entire log message is prefixed and suffixed with a few characters (not entirely sure why)
+	// We mimic those here
 	if req.URL.Path == "/v2/apps/example-go/logs" && req.URL.RawQuery == "log_lines=1" && req.Method == "GET" {
-		res.Write([]byte("test\n"))
+		res.Write([]byte("b'\"test\"'"))
 		return
 	}
 
@@ -333,11 +337,11 @@ func TestAppsLogs(t *testing.T) {
 	tests := []testExpected{
 		{
 			Input:    -1,
-			Expected: "test\nfoo\nbar\n",
+			Expected: "test foo bar",
 		},
 		{
 			Input:    1,
-			Expected: "test\n",
+			Expected: "test",
 		},
 	}
 

rootfs/deis/settings.py

@@ -267,7 +267,7 @@
 ETCD_PORT = os.environ.get('DEIS_ETCD_1_SERVICE_PORT_CLIENT', 4001)
 
 # default deis settings
-LOG_LINES = 1000
+LOG_LINES = 100
 TEMPDIR = tempfile.mkdtemp(prefix='deis')
 
 # names which apps cannot reserve for routing
@@ -297,7 +297,7 @@
 S3EP = '{}:{}'.format(S3EP_HOST, S3EP_PORT)
 # logger settings
 LOGGER_HOST = os.environ.get('DEIS_LOGGER_SERVICE_HOST', '127.0.0.1')
-LOGGER_PORT = os.environ.get('DEIS_LOGGER_SERVICE_PORT', 8088)
+LOGGER_PORT = os.environ.get('DEIS_LOGGER_PORT_8088_TCP_PORT', 8088)
 
 # check if we can register users with `deis register`
 REGISTRATION_ENABLED = True