From 9985c010bcfc3724e628a998ec811494135646e0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 24 Nov 2019 17:11:53 +0900 Subject: [PATCH] Update master.ts --- src/boot/master.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/boot/master.ts b/src/boot/master.ts index cbdcc712e..db063ef4b 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -11,14 +11,15 @@ import { lessThan } from '../prelude/array'; import { program } from '../argv'; import { showMachineInfo } from '../misc/show-machine-info'; import { initDb } from '../db/postgre'; +import * as meta from '../meta.json'; const logger = new Logger('core', 'cyan'); const bootLogger = logger.createSubLogger('boot', 'magenta', false); -function greet(config: Config) { +function greet() { if (!program.quiet) { //#region Misskey logo - const v = `v${config.version}`; + const v = `v${meta.version}`; console.log(' _____ _ _ '); console.log(' | |_|___ ___| |_ ___ _ _ '); console.log(' | | | | |_ -|_ -| \'_| -_| | |'); @@ -34,7 +35,7 @@ function greet(config: Config) { } bootLogger.info('Welcome to Misskey!'); - bootLogger.info(`Misskey v${config.version}`, null, true); + bootLogger.info(`Misskey v${meta.version}`, null, true); } /** @@ -44,11 +45,11 @@ export async function masterMain() { let config!: Config; try { + greet(); + // initialize app config = await init(); - greet(config); - if (config.port == null || Number.isNaN(config.port)) { bootLogger.error('The port is not configured. Please configure port.', null, true); process.exit(1);