From 29c7e7e859c051fb290cc819be54e8ff2532ee94 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Wed, 7 Sep 2022 16:45:44 -0400 Subject: [PATCH] backend: fix types in boot/{master, worker}.ts --- packages/backend/src/boot/master.ts | 15 ++++++++------- packages/backend/src/boot/worker.ts | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 67cfcca63..d823569e4 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -32,7 +32,7 @@ function greet(): void { console.log(themeColor(' | |_|___ ___| |_ ___ _ _ ')); console.log(themeColor(' | | | | |_ -|_ -| \'_| -_| | |')); console.log(themeColor(' |_|_|_|_|___|___|_,_|___|_ |')); - console.log(' ' + chalk.gray(v) + themeColor(' |___|\n'.substr(v.length))); + console.log(' ' + chalk.gray(v) + themeColor(' |___|\n'.slice(v.length))); //#endregion console.log(' Misskey is an open-source decentralized microblogging platform.'); @@ -61,7 +61,7 @@ export async function masterMain(): Promise { config = loadConfigBoot(); await connectDb(); } catch (e) { - bootLogger.error('Fatal error occurred during initialization', null, true); + bootLogger.error('Fatal error occurred during initialization', {}, true); process.exit(1); } @@ -87,7 +87,7 @@ function showEnvironment(): void { if (env !== 'production') { logger.warn('The environment is not in production mode.'); - logger.warn('DO NOT USE FOR PRODUCTION PURPOSE!', null, true); + logger.warn('DO NOT USE FOR PRODUCTION PURPOSE!', {}, true); } } @@ -110,8 +110,9 @@ function loadConfigBoot(): Config { try { config = loadConfig(); } catch (exception) { - if (exception.code === 'ENOENT') { - configLogger.error('Configuration file not found', null, true); + const e = exception as Partial | Error; + if ('code' in e && e.code === 'ENOENT') { + configLogger.error('Configuration file not found', {}, true); process.exit(1); } else if (e instanceof Error) { configLogger.error(e.message); @@ -135,8 +136,8 @@ async function connectDb(): Promise { const v = await db.query('SHOW server_version').then(x => x[0].server_version); dbLogger.succ(`Connected: v${v}`); } catch (e) { - dbLogger.error('Cannot connect', null, true); - dbLogger.error(e); + dbLogger.error('Cannot connect', {}, true); + dbLogger.error(e as Error | string); process.exit(1); } } diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index af2df4471..7c4885126 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -15,6 +15,6 @@ export async function workerMain(): Promise { if (cluster.isWorker) { // Send a 'ready' message to parent process - process.send!('ready'); + process.send?.('ready'); } }