feat(logs): added ability to view raw job logs

Author: jkuri

package-lock.json

@@ -164,6 +164,7 @@
     "sass-loader": "^6.0.6",
     "shebang": "0.0.1",
     "source-map-loader": "^0.2.3",
+    "strip-ansi": "^4.0.0",
     "style-loader": "^0.19.0",
     "temp": "^0.8.3",
     "to-string-loader": "^1.1.5",

package.json

@@ -44,7 +44,11 @@ export function buildDockerImage(data: ImageData): void {
       .then(output => {
         output.on('data', d => {
           const output = d.toString();
-          const parsed = JSON.parse(output);
+          let parsed = null;
+
+          try {
+            parsed = JSON.parse(output);
+          } catch (e) { }
 
           if (parsed && parsed.errorDetail) {
             const error = parsed.errorDetail.error ? `(${parsed.errorDetail.error})` : '';

src/api/image-builder.ts

@@ -27,7 +27,7 @@ import {
   saveRepositorySettings
 } from './db/repository';
 import { getBuilds, getBuild } from './db/build';
-import { getJob } from './db/job';
+import { getJob, getLastRun } from './db/job';
 import { getJobRuns, getJobRunsBetween } from './db/job-run';
 import { insertAccessToken, getAccessTokens, removeAccessToken } from './db/access-token';
 import {
@@ -59,6 +59,7 @@ import {
 } from './setup';
 import { startBuild } from './process-manager';
 import * as multer from 'multer';
+import * as stripAnsi from 'strip-ansi';
 
 const config: any = getConfig();
 
@@ -130,18 +131,23 @@ export function buildRoutes(): express.Router {
 export function jobRoutes(): express.Router {
   const router = express.Router();
 
+  router.get('/:id/log', (req: express.Request, res: express.Response) => {
+    getLastRun(req.params.id).then(jobRun => {
+      if (jobRun && jobRun.log) {
+        const log = stripAnsi(jobRun.log.replace(/\r\n/g, '<br/>'));
+        return res.status(200).type('html').send(log);
+      } else {
+        return res.status(404).json({ data: 'not found' });
+      }
+    })
+    .catch(err => res.status(200).json({ err: err }));
+  });
+
   router.get('/:id/:userid?', (req: express.Request, res: express.Response) => {
-    if (req.params.userid) {
-      getJob(req.params.id, req.params.userid).then(job => {
-        return res.status(200).json({ data: job });
-      })
-      .catch(err => res.status(200).json({ err: err }));
-    } else {
-      getJob(req.params.id, req.params.userid).then(job => {
-        return res.status(200).json({ data: job });
-      })
-      .catch(err => res.status(200).json({ err: err }));
-    }
+    getJob(req.params.id, req.params.userid).then(job => {
+      return res.status(200).json({ data: job });
+    })
+    .catch(err => res.status(200).json({ err: err }));
   });
 
   return router;

src/api/server-routes.ts

@@ -169,7 +169,13 @@ <h2 name="message" *ngIf="commitMessage">{{ commitMessage }}</h2>
             </div>
           </div>
           <div class="column is-12">
-            <app-terminal [data]="terminalInput" (outputData)="terminalOutput($event)" [options]="terminalOptions"></app-terminal>
+            <div class="terminal-container">
+              <app-terminal [data]="terminalInput" (outputData)="terminalOutput($event)" [options]="terminalOptions"></app-terminal>
+              <a class="view-raw-log" *ngIf="jobRun?.status !== 'running'" [href]="'/api/jobs/' + job?.id + '/log'" target="_blank">
+                <i class="ionicon ion-document-text"></i>
+                View Raw Log
+              </a>
+            </div>
           </div>
         </div>
       </div>