From 84ff90b0ef55a0b6bdbdb7280b1682f896d06bcf Mon Sep 17 00:00:00 2001
From: Jason Park <parkjs814@gmail.com>
Date: Sun, 9 Jun 2019 03:16:28 +0900
Subject: [PATCH] Print out building/updating logs to console

---
 src/Server.ts                             | 14 +++++++++++---
 src/middlewares/errorHandlerMiddleware.ts |  4 ++--
 src/tracers/DockerTracer.ts               |  6 +++++-
 src/utils/misc.ts                         | 17 ++++++++++++++---
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/Server.ts b/src/Server.ts
index ad9d1d0..3130322 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -31,7 +31,7 @@ export default class Server {
       .use('/api', this.getApiRouter())
       .use(frontendMiddleware(this));
     if (this.webhook) {
-      this.app.use('/webhook', this.webhook);
+      this.app.use(this.webhook);
     }
     this.app.use(errorHandlerMiddleware());
 
@@ -75,7 +75,11 @@ export default class Server {
 
   async update(commit?: string) {
     await pull(rootDir, 'server', commit);
-    await execute('npm install', {cwd: rootDir});
+    await execute('npm install', {
+      cwd: rootDir,
+      stdout: process.stdout,
+      stderr: process.stderr,
+    });
     process.exit(0);
   };
 
@@ -86,7 +90,11 @@ export default class Server {
       'npm run build',
       `rm -rf ${frontendBuiltDir}`,
       `mv ${frontendBuildDir} ${frontendBuiltDir}`,
-    ].join(' && '), {cwd: frontendDir});
+    ].join(' && '), {
+      cwd: frontendDir,
+      stdout: process.stdout,
+      stderr: process.stderr,
+    });
   }
 
   start() {
diff --git a/src/middlewares/errorHandlerMiddleware.ts b/src/middlewares/errorHandlerMiddleware.ts
index 8a1936a..8eeb830 100644
--- a/src/middlewares/errorHandlerMiddleware.ts
+++ b/src/middlewares/errorHandlerMiddleware.ts
@@ -8,7 +8,7 @@ export function errorHandlerMiddleware() {
       err = new InternalServerError(err.message, err);
     }
 
-    const {name, message, status} = err;
-    res.status(status).json({name, message, status});
+    const {message, status} = err;
+    res.status(status).send(message);
   };
 }
diff --git a/src/tracers/DockerTracer.ts b/src/tracers/DockerTracer.ts
index b3d5e27..e22692f 100644
--- a/src/tracers/DockerTracer.ts
+++ b/src/tracers/DockerTracer.ts
@@ -21,7 +21,11 @@ export class DockerTracer extends Tracer {
 
   build(release: Release) {
     const {tag_name} = release;
-    return execute(`docker build -t ${this.imageName} . --build-arg tag_name=${tag_name}`, {cwd: this.directory});
+    return execute(`docker build -t ${this.imageName} . --build-arg tag_name=${tag_name}`, {
+      cwd: this.directory,
+      stdout: process.stdout,
+      stderr: process.stderr,
+    });
   }
 
   route(router: express.Router) {
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 6074ad2..56f73c1 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -17,11 +17,22 @@ export function download(url: string, localPath: string) {
 
 export async function pull(dir: string, repo: string, commit = 'origin/master') {
   if (fs.pathExistsSync(dir)) {
-    await execute(`git fetch`, {cwd: dir});
+    await execute(`git fetch`, {
+      cwd: dir,
+      stdout: process.stdout,
+      stderr: process.stderr,
+    });
   } else {
-    await execute(`git clone https://github.com/algorithm-visualizer/${repo}.git ${dir}`);
+    await execute(`git clone https://github.com/algorithm-visualizer/${repo}.git ${dir}`, {
+      stdout: process.stdout,
+      stderr: process.stderr,
+    });
   }
-  await execute(`git reset --hard ${commit}`, {cwd: dir});
+  await execute(`git reset --hard ${commit}`, {
+    cwd: dir,
+    stdout: process.stdout,
+    stderr: process.stderr,
+  });
 }
 
 export function getDescription(files: File[]) {