From d50e99c17bddc04ca7a09b85a70603ff5404739a Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Sat, 14 Jul 2018 20:58:21 +0900
Subject: Update log messages

---
 src/misc/dependencyInfo.ts |  2 +-
 src/misc/logger.ts         | 46 ++++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

(limited to 'src/misc')

diff --git a/src/misc/dependencyInfo.ts b/src/misc/dependencyInfo.ts
index 89af0d20fb..829f8d9809 100644
--- a/src/misc/dependencyInfo.ts
+++ b/src/misc/dependencyInfo.ts
@@ -21,7 +21,7 @@ export default class {
 			const x = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] });
 			const ver = transform(x.toString());
 			if (ver != null) {
-				this.logger.info(`${serviceName} ${ver[1]} found`);
+				this.logger.succ(`${serviceName} ${ver[1]} found`);
 			} else {
 				this.logger.warn(`${serviceName} not found`);
 				this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`);
diff --git a/src/misc/logger.ts b/src/misc/logger.ts
index deb5bab17a..51c8adf037 100644
--- a/src/misc/logger.ts
+++ b/src/misc/logger.ts
@@ -1,14 +1,5 @@
-import chalk, { Chalk } from 'chalk';
-
-export type LogLevel = 'Error' | 'Warn' | 'Info';
-
-function toLevelColor(level: LogLevel): Chalk {
-	switch (level) {
-		case 'Error': return chalk.red;
-		case 'Warn': return chalk.yellow;
-		case 'Info': return chalk.blue;
-	}
-}
+import chalk from 'chalk';
+import * as dateformat from 'dateformat';
 
 export default class Logger {
 	private domain: string;
@@ -17,38 +8,45 @@ export default class Logger {
 		this.domain = domain;
 	}
 
-	public static log(level: LogLevel, message: string): void {
-		const color = toLevelColor(level);
-		const time = (new Date()).toLocaleTimeString('ja-JP');
-		const coloredMessage = level === 'Info' ? message : color.bold(message);
-		console.log(`[${time} ${color.bold(level.toUpperCase())}]: ${coloredMessage}`);
+	public static log(level: string, message: string): void {
+		const time = dateformat(new Date(), 'HH:MM:ss');
+		console.log(`[${time} ${level}] ${message}`);
 	}
 
 	public static error(message: string): void {
-		Logger.log('Error', message);
+		(new Logger('')).error(message);
 	}
 
 	public static warn(message: string): void {
-		Logger.log('Warn', message);
+		(new Logger('')).warn(message);
 	}
 
 	public static info(message: string): void {
-		Logger.log('Info', message);
+		(new Logger('')).info(message);
 	}
 
-	public log(level: LogLevel, message: string): void {
-		Logger.log(level, `[${this.domain}] ${message}`);
+	public static succ(message: string): void {
+		(new Logger('')).succ(message);
+	}
+
+	public log(level: string, message: string) {
+		const domain = this.domain.length > 0 ? `[${this.domain}] ` : '';
+		Logger.log(level, `${domain}${message}`);
 	}
 
 	public error(message: string): void {
-		this.log('Error', message);
+		this.log(chalk.red.bold('ERROR'), chalk.red.bold(message));
 	}
 
 	public warn(message: string): void {
-		this.log('Warn', message);
+		this.log(chalk.yellow.bold('WARN'), chalk.yellow.bold(message));
 	}
 
 	public info(message: string): void {
-		this.log('Info', message);
+		this.log(chalk.blue.bold('INFO'), message);
+	}
+
+	public succ(message: string): void {
+		this.log(chalk.blue.bold('INFO'), chalk.green.bold(message));
 	}
 }
-- 
cgit v1.2.3-freya