summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-14 00:34:08 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-14 00:34:08 +0900
commit73c328f90b233d15aace540d555f76cdf913ec7f (patch)
tree97ceb2e5a6be510260be8211aac7121bcfe93b97 /src
parentFix bug (diff)
parentMerge branch 'master' of aya.github:syuilo/misskey (diff)
downloadmisskey-73c328f90b233d15aace540d555f76cdf913ec7f.tar.gz
misskey-73c328f90b233d15aace540d555f76cdf913ec7f.tar.bz2
misskey-73c328f90b233d15aace540d555f76cdf913ec7f.zip
Merge branch 'master' of https://github.com/syuilo/misskey
Diffstat (limited to 'src')
-rw-r--r--src/index.ts6
-rw-r--r--src/misc/logger.ts3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/index.ts b/src/index.ts
index c5f5d32e57..879e5ceee1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -122,11 +122,13 @@ async function init(): Promise<Config> {
configLogger.info(`Maintainer: ${config.maintainer.name}`);
if (process.platform === 'linux' && !isRoot() && config.port < 1024) {
- throw 'You need root privileges to listen on port below 1024 on Linux';
+ Logger.error('You need root privileges to listen on port below 1024 on Linux');
+ process.exit(1);
}
if (await portscanner.checkPortStatus(config.port, '127.0.0.1') === 'open') {
- throw `Port ${config.port} is already in use`;
+ Logger.error(`Port ${config.port} is already in use`);
+ process.exit(1);
}
// Try to connect to MongoDB
diff --git a/src/misc/logger.ts b/src/misc/logger.ts
index fae1042c39..deb5bab17a 100644
--- a/src/misc/logger.ts
+++ b/src/misc/logger.ts
@@ -20,7 +20,8 @@ export default class Logger {
public static log(level: LogLevel, message: string): void {
const color = toLevelColor(level);
const time = (new Date()).toLocaleTimeString('ja-JP');
- console.log(`[${time} ${color.bold(level.toUpperCase())}]: ${message}`);
+ const coloredMessage = level === 'Info' ? message : color.bold(message);
+ console.log(`[${time} ${color.bold(level.toUpperCase())}]: ${coloredMessage}`);
}
public static error(message: string): void {