From e80a1c1b6ee3c79d050aeb9a0ee9c2443f66854f Mon Sep 17 00:00:00 2001 From: plane000 Date: Mon, 27 Aug 2018 18:00:31 +0100 Subject: [PATCH] removed useless package and added middleware logger --- package.json | 1 - src/app.js | 15 ++++++++------- src/controllers/middleware.js | 2 +- src/models/database/baseDatabase.js | 2 +- src/models/logger.js | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 5376949..6f64da4 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "colors": "^1.3.1", "express": "^4.16.3", "json-stringify-safe": "^5.0.1", - "mysql": "^2.16.0", "regenerator-runtime": "^0.12.1", "sequelize": "^4.38.0", "sqlite3": "^4.0.2" diff --git a/src/app.js b/src/app.js index cb61598..5e3b10f 100644 --- a/src/app.js +++ b/src/app.js @@ -13,13 +13,14 @@ async function init() { await Database.testConnection(); await Server.start(); await Router.initEndpoints(); - + + // Logger.database('Database Log'); + // Logger.middleware('GET request to /'); + // Logger.debug('Debug mode enabled'); + // Logger.info('Informatic log'); + // Logger.warn('Warning'); + // Logger.error('An error has occured'); + // Logger.panic('A fatal error has occured, exiting'); } -// Logger.database('Database Log'); -// Logger.debug('Debug mode enabled'); -// Logger.info('Informatic log'); -// Logger.warn('Warning'); -// Logger.error('An error has occured'); -// Logger.panic('A fatal error has occured, exiting'); \ No newline at end of file diff --git a/src/controllers/middleware.js b/src/controllers/middleware.js index 52c34c5..2287396 100644 --- a/src/controllers/middleware.js +++ b/src/controllers/middleware.js @@ -5,7 +5,7 @@ import {Logger} from '../models/logger'; export class MiddleWare { static analytics(req, res, next) { // TODO: Send data such as IP to an anyaltitics model - Logger.info(`${req.method} request to ${req.url}`) + Logger.middleware(`${req.method} request to ${req.url}`) next(); } diff --git a/src/models/database/baseDatabase.js b/src/models/database/baseDatabase.js index 9885d51..6819388 100644 --- a/src/models/database/baseDatabase.js +++ b/src/models/database/baseDatabase.js @@ -10,7 +10,7 @@ let auth; let session; export class BaseDatabase { - static get Connection() {return connection} + static get Connection() {return connection;} static async init() { Logger.info('Connecting to SQLite Database'); diff --git a/src/models/logger.js b/src/models/logger.js index 17ff17c..5cab5fa 100644 --- a/src/models/logger.js +++ b/src/models/logger.js @@ -18,6 +18,13 @@ export class Logger { + colours.magenta('SQLITE') + '] ' + message); } + static middleware(message) { + if (LogLevel > 0) return; + let d = new Date(); + console.log('[' + d.toLocaleString() + '] [' + + colours.blue('HTTP-MIDDLEWARE') + '] ' + message); + } + static debug(message) { if (LogLevel > 1) return; let d = new Date();