graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 23:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat(server): Improve boot process

Browse source
This commit is contained in:
syuilo 2020-04-26 11:39:15 +09:00
parent a8b4df6eae
commit 14ddca3875
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/boot/master.ts
View file

@ -32,7 +32,7 @@ function greet() {
console.log(chalk.keyword('orange')(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo')); console.log(chalk.keyword('orange')(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
console.log(''); console.log('');
console.log(chalk`< ${os.hostname()} {gray (PID: ${process.pid.toString()})} >`); console.log(chalk`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
} }
bootLogger.info('Welcome to Misskey!'); bootLogger.info('Welcome to Misskey!');
@ -76,13 +76,13 @@ export async function masterMain() {
await spawnWorkers(config.clusterLimit); await spawnWorkers(config.clusterLimit);
} }
bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
if (!program.noDaemons) { if (!program.noDaemons) {
require('../daemons/server-stats').default(); require('../daemons/server-stats').default();
require('../daemons/queue-stats').default(); require('../daemons/queue-stats').default();
require('../daemons/janitor').default(); require('../daemons/janitor').default();
} }
bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
} }
const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseInt(x, 10)); const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseInt(x, 10));
@ -116,6 +116,8 @@ function showEnvironment(): void {
async function init(): Promise<Config> { async function init(): Promise<Config> {
showEnvironment(); showEnvironment();
await showMachineInfo(bootLogger);
const nodejsLogger = bootLogger.createSubLogger('nodejs'); const nodejsLogger = bootLogger.createSubLogger('nodejs');
nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`); nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`);
@ -125,8 +127,6 @@ async function init(): Promise<Config> {
process.exit(1); process.exit(1);
} }
await showMachineInfo(bootLogger);
const configLogger = bootLogger.createSubLogger('config'); const configLogger = bootLogger.createSubLogger('config');
let config; let config;
@ -146,15 +146,17 @@ async function init(): Promise<Config> {
configLogger.succ('Loaded'); configLogger.succ('Loaded');
const dbLogger = bootLogger.createSubLogger('db');
// Try to connect to DB // Try to connect to DB
try { try {
bootLogger.info('Connecting database...'); dbLogger.info('Connecting...');
await initDb(); await initDb();
const v = await getConnection().query('SHOW server_version').then(x => x[0].server_version) const v = await getConnection().query('SHOW server_version').then(x => x[0].server_version)
bootLogger.succ(`Connected to database: v${v}`); dbLogger.succ(`Connected: v${v}`);
} catch (e) { } catch (e) {
bootLogger.error('Cannot connect to database', null, true); dbLogger.error('Cannot connect', null, true);
bootLogger.error(e); dbLogger.error(e);
process.exit(1); process.exit(1);
} }