From bb919fc524b1c71e648fddbf116f7f6543b9c92f Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Wed, 17 Aug 2022 20:29:19 +0100 Subject: [PATCH] fix: don't return a promise from wrapscriptpromise --- server/src/lib/score-import/worker/queue.ts | 2 +- server/src/utils/misc.ts | 27 +++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/server/src/lib/score-import/worker/queue.ts b/server/src/lib/score-import/worker/queue.ts index 642bfdc35..f1f903b75 100644 --- a/server/src/lib/score-import/worker/queue.ts +++ b/server/src/lib/score-import/worker/queue.ts @@ -6,7 +6,7 @@ const ScoreImportQueue = new Queue(`${TachiConfig.NAME} Score Import Queue`, { defaultJobOptions: { removeOnComplete: true, removeOnFail: 10, // keep the last 10 failed jobs, but start pruning beyond that. - } + }, }); export default ScoreImportQueue; diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.ts index cdfb1c1b4..5d8088bb5 100644 --- a/server/src/utils/misc.ts +++ b/server/src/utils/misc.ts @@ -265,20 +265,21 @@ export function IsRecord(maybeRecord: unknown): maybeRecord is Record, logger: KtLogger) { +export function WrapScriptPromise(promise: Promise, logger: KtLogger) { let code = 0; - try { - await promise; + void promise + .then(() => { + logger.info(`Finished executing.`); + }) + .catch((err: Error) => { + logger.error(`Failed executing.`, { err }); - logger.info(`Finished executing.`); - } catch (err) { - logger.error(`Failed executing.`, { err }); - - code = 1; - } - - logger.end(() => { - process.exit(code); - }); + code = 1; + }) + .finally(() => { + logger.end(() => { + process.exit(code); + }); + }); }