From 643cc38720ff7814c70717b8b73ada934b4169de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Fournier?= Date: Tue, 6 Feb 2024 09:10:18 +0100 Subject: [PATCH] chore: type improvement for schedulers --- src/lib/features/scheduler/schedule-services.ts | 9 +++++---- src/lib/features/scheduler/scheduler-service.ts | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/features/scheduler/schedule-services.ts b/src/lib/features/scheduler/schedule-services.ts index dce98aca855..4a43056f165 100644 --- a/src/lib/features/scheduler/schedule-services.ts +++ b/src/lib/features/scheduler/schedule-services.ts @@ -48,6 +48,7 @@ export const scheduleServices = async ( apiTokenService.fetchActiveTokens.bind(apiTokenService), minutesToMilliseconds(1), 'fetchActiveTokens', + 0, // no jitter -> run immediately ); schedulerService.schedule( @@ -131,16 +132,16 @@ export const scheduleServices = async ( ); schedulerService.schedule( - () => { - clientMetricsServiceV2.bulkAdd().catch(console.error); + async () => { + await clientMetricsServiceV2.bulkAdd().catch(console.error); }, secondsToMilliseconds(5), 'bulkAddMetrics', ); schedulerService.schedule( - () => { - clientMetricsServiceV2.clearMetrics(48).catch(console.error); + async () => { + await clientMetricsServiceV2.clearMetrics(48).catch(console.error); }, hoursToMilliseconds(12), 'clearMetrics', diff --git a/src/lib/features/scheduler/scheduler-service.ts b/src/lib/features/scheduler/scheduler-service.ts index 1e95b3479da..63dc3cca50d 100644 --- a/src/lib/features/scheduler/scheduler-service.ts +++ b/src/lib/features/scheduler/scheduler-service.ts @@ -38,7 +38,7 @@ export class SchedulerService { } async schedule( - scheduledFunction: () => void, + scheduledFunction: () => Promise, timeMs: number, id: string, jitter = randomJitter(2 * 1000, 30 * 1000, timeMs),