feat(logger): enable logger to database

bleenco · Sep 4, 2017 · dced1fe · dced1fe
1 parent 31d6c1f
commit dced1fe
Show file tree

Hide file tree

Showing 9 changed files with 173 additions and 74 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,6 +77,7 @@
     "@types/chalk": "^0.4.31",
     "@types/cors": "^2.8.1",
     "@types/express": "^4.0.37",
+    "@types/express-session": "^1.15.3",
     "@types/jasmine": "^2.5.54",
     "@types/jsonwebtoken": "^7.2.3",
     "@types/knex": "0.0.59",
@@ -115,6 +116,7 @@
     "date-fns": "^1.28.5",
     "enhanced-resolve": "^3.4.1",
     "express": "^4.15.4",
+    "express-session": "^1.15.5",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
     "fs-extra": "^4.0.1",

diff --git a/src/api/commit-status.ts b/src/api/commit-status.ts
@@ -1,6 +1,7 @@
-import { sendRequest, getBitBucketAccessToken, getConfig } from './utils';
+import { getBitBucketAccessToken, getConfig } from './utils';
 import * as logger from './logger';
-import { yellow, red, blue, bold } from 'chalk';
+import { yellow, red, blue, bold, cyan } from 'chalk';
+import * as request from 'request';
 
 export function sendSuccessStatus(build: any, buildId: number): Promise<void> {
   const config: any = getConfig();
@@ -331,3 +332,64 @@ function setBitbucketStatusFailure(
     })
     .catch(err => Promise.reject(err));
 }
+
+function sendRequest(url: string, data: any, headers: any): Promise<any> {
+  return new Promise((resolve, reject) => {
+    let options = {
+      url: url,
+      method: 'POST',
+      headers: headers,
+      json: data
+    };
+
+    let msg = [
+      yellow('['),
+      cyan('http'),
+      yellow(']'),
+      ' --- ',
+      yellow(`sending ${options.method} request to ${bold(url)}...`)
+    ].join('');
+    logger.info(msg);
+
+    request(options, (err, response, body) => {
+      if (err) {
+        let msg = [
+          yellow('['),
+          cyan('http'),
+          yellow(']'),
+          ' --- ',
+          red(`sending request to ${bold(url)} failed (${err})`)
+        ].join('');
+        logger.error(msg);
+
+        reject(err);
+      } else {
+        if (response.statusCode < 300 && response.statusCode >= 200) {
+          let msg = [
+            yellow('['),
+            cyan('http'),
+            yellow(']'),
+            ' --- ',
+            yellow(`sending request to ${bold(url)} successful (${response.statusCode})`)
+          ].join('');
+          logger.info(msg);
+          resolve(body);
+        } else {
+          let msg = [
+            yellow('['),
+            cyan('http'),
+            yellow(']'),
+            ' --- ',
+            red(`sending request to ${bold(url)} failed (${response.statusCode})`)
+          ].join('');
+          logger.error(msg);
+
+          reject({
+            statusCode: response.statusCode,
+            response: body
+          });
+        }
+      }
+    });
+  });
+}
diff --git a/src/api/db/config.ts b/src/api/db/config.ts
@@ -1,22 +1,22 @@
 import * as bookshelf from 'bookshelf';
 import * as knex from 'knex';
-import { configExists, writeDefaultConfig, getConfig, getFilePath } from '../utils';
+import * as utils from '../utils';
 import * as jsonColumns from 'bookshelf-json-columns';
 
-if (!configExists()) {
-  writeDefaultConfig();
+if (!utils.configExists()) {
+  utils.writeDefaultConfig();
 }
 
-let config: any = getConfig();
+let config: any = utils.getConfig();
 let dbConfig = Object.assign({}, config.db, {
   migrations: {
     tableName: 'knex_migrations',
-    directory: getFilePath('migrations')
+    directory: utils.getFilePath('migrations')
   }
 });
 
 if (dbConfig.connection.filename) {
-  dbConfig.connection.filename = getFilePath(dbConfig.connection.filename);
+  dbConfig.connection.filename = utils.getFilePath(dbConfig.connection.filename);
 }
 
 export let Knex: knex = knex(dbConfig);

diff --git a/src/api/db/log.ts b/src/api/db/log.ts
@@ -0,0 +1,33 @@
+import { Log } from './model';
+
+export interface LogType {
+  type: 'info' | 'warning' | 'error';
+  message: string;
+}
+
+export function insertLog(data: LogType): Promise<any> {
+  return new Promise((resolve, reject) => {
+    new Log(data).save(null, { method: 'insert' })
+      .then(log => !log ? reject(log) : resolve(log.toJSON()));
+  });
+}
+
+export function getLogs(
+  limit: number,
+  offset: number,
+  type?: 'info' | 'warning' | 'error'
+): Promise<any[]> {
+  return new Promise((resolve, reject) => {
+    new Log().query(q => {
+      if (type) {
+        q.where('type', type);
+      }
+
+      q.orderBy('id', 'desc');
+      q.limit(limit);
+      q.offset(offset);
+    })
+    .fetchAll()
+    .then(logs => !logs ? reject(logs) : resolve(logs.toJSON()));
+  });
+}
diff --git a/src/api/db/migrations.ts b/src/api/db/migrations.ts
@@ -98,6 +98,13 @@ export function create(): Promise<null> {
       t.boolean('permission').notNullable().defaultTo(true);
       t.timestamps();
     }))
+    .then(() => schema.createTableIfNotExists('logs', (t: knex.TableBuilder) => {
+      t.increments('id').unsigned().primary();
+      t.enum('type', ['info', 'warning', 'error']).notNullable();
+      t.text('message').notNullable();
+      t.boolean('read').notNullable().defaultTo(false);
+      t.timestamps();
+    }))
     .then(() => resolve())
     .catch(err => {
       console.error(err);

diff --git a/src/api/db/model.ts b/src/api/db/model.ts
@@ -58,3 +58,8 @@ export class Permission extends Bookshelf.Model<any> {
   repository() { return this.belongsTo(Repository, 'repositories_id'); }
   user() { return this.belongsTo(User, 'users_id'); }
 }
+
+export class Log extends Bookshelf.Model<any> {
+  get tableName() { return 'logs'; }
+  get hasTimestamps() { return true; }
+}
diff --git a/src/api/logger.ts b/src/api/logger.ts
@@ -1,18 +1,22 @@
 import { red, green, blue, magenta, cyan, yellow, white } from 'chalk';
+import { insertLog } from './db/log';
 
 export function info(msg: string): void {
   const time = getDateTime();
-  console.log(`${green('[' + time + ']')} ${white(msg)}`);
+  insertLog({ message: msg, type: 'info' })
+    .then(() => console.log(`${green('[' + time + ']')} ${white(msg)}`));
 }
 
 export function error(msg: string | any): void {
   const time = getDateTime();
-  console.log(`${green('[' + time + ']')} ${red(msg)}`);
+  insertLog({ message: msg, type: 'error' })
+    .then(() => console.log(`${green('[' + time + ']')} ${red(msg)}`));
 }
 
 export function warning(msg: string): void {
   const time = getDateTime();
-  console.log(`${green('[' + time + ']')} ${yellow(msg)}`);
+  insertLog({ message: msg, type: 'warning' })
+    .then(() => console.log(`${green('[' + time + ']')} ${yellow(msg)}`));
 }
 
 function getDateTime(): string {

diff --git a/src/api/utils.ts b/src/api/utils.ts
@@ -7,7 +7,6 @@ import { Observable } from 'rxjs';
 import * as uuid from 'uuid';
 import * as request from 'request';
 import * as temp from 'temp';
-import * as logger from './logger';
 import { blue, yellow, magenta, cyan, bold, red } from 'chalk';
 
 const defaultConfig = {
@@ -211,64 +210,3 @@ export function getBitBucketAccessToken(clientCredentials: string): Promise<any>
       });
     });
 }
-
-export function sendRequest(url: string, data: any, headers: any): Promise<any> {
-  return new Promise((resolve, reject) => {
-    let options = {
-      url: url,
-      method: 'POST',
-      headers: headers,
-      json: data
-    };
-
-    let msg = [
-      yellow('['),
-      blue('http'),
-      yellow(']'),
-      ' --- ',
-      yellow(`sending ${options.method} request to ${bold(url)}...`)
-    ].join('');
-    logger.info(msg);
-
-    request(options, (err, response, body) => {
-      if (err) {
-        let msg = [
-          yellow('['),
-          blue('http'),
-          yellow(']'),
-          ' --- ',
-          red(`sending request to ${bold(url)} failed (${err})`)
-        ].join('');
-        logger.error(msg);
-
-        reject(err);
-      } else {
-        if (response.statusCode < 300 && response.statusCode >= 200) {
-          let msg = [
-            yellow('['),
-            blue('http'),
-            yellow(']'),
-            ' --- ',
-            yellow(`sending request to ${bold(url)} successful (${response.statusCode})`)
-          ].join('');
-          logger.info(msg);
-          resolve(body);
-        } else {
-          let msg = [
-            yellow('['),
-            blue('http'),
-            yellow(']'),
-            ' --- ',
-            red(`sending request to ${bold(url)} failed (${response.statusCode})`)
-          ].join('');
-          logger.error(msg);
-
-          reject({
-            statusCode: response.statusCode,
-            response: body
-          });
-        }
-      }
-    });
-  });
-}