From a3e37294e5d4f381e7dfaefae823a7e3ef0a4203 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 3 Feb 2019 01:33:34 +0900 Subject: [PATCH] Better logs --- src/index.ts | 11 ++++++----- src/misc/logger.ts | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/index.ts b/src/index.ts index 1c54246c4..8ec8a2744 100644 --- a/src/index.ts +++ b/src/index.ts @@ -72,6 +72,9 @@ function main() { async function masterMain() { let config: Config; + bootLogger.info('Welcome to Misskey!'); + bootLogger.info(`Misskey v${pkg.version}`, true); + try { // initialize app config = await init(); @@ -133,8 +136,8 @@ function showEnvironment(): void { logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`); if (env !== 'production') { - logger.warn('The environment is not in production mode'); - logger.warn('Do not use for production purpose'); + logger.warn('The environment is not in production mode.'); + logger.warn('Do not use for production purpose!', true); } logger.info(`You ${isRoot() ? '' : 'do not '}have root privileges`); @@ -144,8 +147,7 @@ function showEnvironment(): void { * Init app */ async function init(): Promise { - bootLogger.info('Welcome to Misskey!'); - bootLogger.info(`<<< Misskey v${pkg.version} >>>`); + showEnvironment(); const nodejsLogger = bootLogger.createSubLogger('nodejs'); @@ -157,7 +159,6 @@ async function init(): Promise { } await showMachine(); - showEnvironment(); const configLogger = bootLogger.createSubLogger('config'); let config; diff --git a/src/misc/logger.ts b/src/misc/logger.ts index 0dbda4ca6..2ca79dd4b 100644 --- a/src/misc/logger.ts +++ b/src/misc/logger.ts @@ -29,16 +29,16 @@ export default class Logger { 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 warn(message: string, important = false): void { // 実行を継続できるが改善すべき状況で使う + this.log(chalk.yellow.bold('WARN'), chalk.yellow.bold(message), important); } public succ(message: string, important = false): void { // 何かに成功した状況で使う this.log(chalk.blue.green('DONE'), chalk.green.bold(message), important); } - public info(message: string): void { // それ以外 - this.log(chalk.blue.bold('INFO'), message); + public info(message: string, important = false): void { // それ以外 + this.log(chalk.blue.bold('INFO'), message, important); } }