From 92813f051e92b2f7e6830cf83fcc7d7534ad6698 Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Sat, 26 Jan 2019 23:38:51 -0800
Subject: [PATCH] Fixed logs for app

---
 src/docker/DockerApi.ts          | 4 ++++
 src/routes/apps/AppDataRouter.ts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/docker/DockerApi.ts b/src/docker/DockerApi.ts
index ee845b5..3b4c8fa 100644
--- a/src/docker/DockerApi.ts
+++ b/src/docker/DockerApi.ts
@@ -1480,11 +1480,15 @@ class DockerApi {
                 return (self.dockerode.getService(serviceName) as any) //
                     .logs({
                         tail: tailCount,
+                        follow: false,
                         timestamps: true,
                         stdout: true,
                         stderr: true,
                     })
             })
+            .then(function(data) {
+                return data && data.toString ? data.toString('utf8') : data
+            })
     }
 
     getDockerVersion() {
diff --git a/src/routes/apps/AppDataRouter.ts b/src/routes/apps/AppDataRouter.ts
index 4accbf9..2e11259 100644
--- a/src/routes/apps/AppDataRouter.ts
+++ b/src/routes/apps/AppDataRouter.ts
@@ -26,7 +26,7 @@ router.get('/:appName/logs', function(req, res, next) {
         .then(function(logs) {
             let baseApi = new BaseApi(
                 ApiStatusCodes.STATUS_OK,
-                'App build status retrieved'
+                'App runtime logs are retrieved'
             )
             baseApi.data = {logs}
             res.send(baseApi)