From 80aa45372a5848ccf88ae4c7589815e82ea2d309 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 3 Feb 2019 01:20:21 +0900 Subject: [PATCH] Better logger --- src/index.ts | 11 ++++++----- src/misc/logger.ts | 31 ++++++++----------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/index.ts b/src/index.ts index e17adb92f..28bc9f3d4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,8 +25,9 @@ import { Config } from './config/types'; import { lessThan } from './prelude/array'; import * as pkg from '../package.json'; -const bootLogger = new Logger('boot'); -const clusterLog = new Logger('cluster'); +const logger = new Logger('core'); +const bootLogger = new Logger('boot', logger); +const clusterLog = new Logger('cluster', logger); const ev = new Xev(); if (process.env.NODE_ENV != 'production' && process.env.DEBUG == null) { @@ -86,7 +87,7 @@ async function masterMain() { await spawnWorkers(config.clusterLimit); } - bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`); + bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, true); } /** @@ -264,12 +265,12 @@ process.on('unhandledRejection', console.dir); // Display detail of uncaught exception process.on('uncaughtException', err => { - console.error(err); + logger.error(err); }); // Dying away... process.on('exit', code => { - Logger.info(`The process is going to exit with code ${code}`); + logger.info(`The process is going to exit with code ${code}`); }); //#endregion diff --git a/src/misc/logger.ts b/src/misc/logger.ts index 925d14d64..402660d97 100644 --- a/src/misc/logger.ts +++ b/src/misc/logger.ts @@ -10,41 +10,26 @@ export default class Logger { this.parentLogger = parentLogger; } - public log(level: string, message: string): void { + public log(level: string, message: string, important = false): void { if (this.parentLogger) { - this.parentLogger.log(level, `[${this.domain}] ${message}`); + this.parentLogger.log(level, `[${this.domain}]\t${message}`, important); } else { const time = dateformat(new Date(), 'HH:MM:ss'); - console.log(`${chalk.gray(time)} ${level} [${this.domain}] ${message}`); + const log = `${chalk.gray(time)} ${level} [${this.domain}]\t${message}`; + console.log(important ? chalk.bold(log) : log); } } - public static error(message: string): void { - (new Logger('')).error(message); - } - - public static warn(message: string): void { - (new Logger('')).warn(message); - } - - public static succ(message: string): void { - (new Logger('')).succ(message); - } - - public static info(message: string): void { - (new Logger('')).info(message); - } - - public error(message: string): void { // 実行を継続できない状況で使う - this.log(chalk.red.bold('ERROR'), chalk.red.bold(message)); + public error(message: string | Error): void { // 実行を継続できない状況で使う + this.log(chalk.red.bold('ERROR'), chalk.red.bold(message.toString())); } public warn(message: string): void { // 実行を継続できるが改善すべき状況で使う this.log(chalk.yellow.bold('WARN'), chalk.yellow.bold(message)); } - public succ(message: string): void { // 何かに成功した状況で使う - this.log(chalk.blue.green('DONE'), chalk.green.bold(message)); + public succ(message: string, important = false): void { // 何かに成功した状況で使う + this.log(chalk.blue.green('DONE'), chalk.green.bold(message), important); } public info(message: string): void { // それ以外