From e414c4446d6b4eade1b31c2aee9c13dd1b9f15c1 Mon Sep 17 00:00:00 2001 From: Mateusz Kwasniewski Date: Fri, 9 May 2025 13:58:52 +0200 Subject: [PATCH] feat: remove instances older than 1 day not 2 days (#9944) --- src/lib/db/client-instance-store.ts | 4 ++-- src/lib/features/metrics/instance/instance-service.ts | 4 ++-- src/lib/features/scheduler/schedule-services.ts | 4 +--- src/lib/types/stores/client-instance-store.ts | 2 +- src/test/fixtures/fake-client-instance-store.ts | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lib/db/client-instance-store.ts b/src/lib/db/client-instance-store.ts index bcf5451adb..e21d68760b 100644 --- a/src/lib/db/client-instance-store.ts +++ b/src/lib/db/client-instance-store.ts @@ -61,9 +61,9 @@ export default class ClientInstanceStore implements IClientInstanceStore { }); } - async removeInstancesOlderThanTwoDays(): Promise { + async removeOldInstances(): Promise { const rows = await this.db(TABLE) - .whereRaw("last_seen < now() - interval '2 days'") + .whereRaw("last_seen < now() - interval '1 days'") .del(); if (rows > 0) { diff --git a/src/lib/features/metrics/instance/instance-service.ts b/src/lib/features/metrics/instance/instance-service.ts index 33682ddff9..40374273a2 100644 --- a/src/lib/features/metrics/instance/instance-service.ts +++ b/src/lib/features/metrics/instance/instance-service.ts @@ -316,8 +316,8 @@ export default class ClientInstanceService { await this.clientApplicationsStore.upsert(input); } - async removeInstancesOlderThanTwoDays(): Promise { - return this.clientInstanceStore.removeInstancesOlderThanTwoDays(); + async removeOldInstances(): Promise { + return this.clientInstanceStore.removeOldInstances(); } async removeInactiveApplications(): Promise { diff --git a/src/lib/features/scheduler/schedule-services.ts b/src/lib/features/scheduler/schedule-services.ts index a1f1510916..951886152d 100644 --- a/src/lib/features/scheduler/schedule-services.ts +++ b/src/lib/features/scheduler/schedule-services.ts @@ -72,9 +72,7 @@ export const scheduleServices = async ( ); schedulerService.schedule( - clientInstanceService.removeInstancesOlderThanTwoDays.bind( - clientInstanceService, - ), + clientInstanceService.removeOldInstances.bind(clientInstanceService), hoursToMilliseconds(24), 'removeInstancesOlderThanTwoDays', ); diff --git a/src/lib/types/stores/client-instance-store.ts b/src/lib/types/stores/client-instance-store.ts index 0c12e046f6..9b636aaefb 100644 --- a/src/lib/types/stores/client-instance-store.ts +++ b/src/lib/types/stores/client-instance-store.ts @@ -35,5 +35,5 @@ export interface IClientInstanceStore getDistinctApplications(): Promise; getDistinctApplicationsCount(daysBefore?: number): Promise; deleteForApplication(appName: string): Promise; - removeInstancesOlderThanTwoDays(): Promise; + removeOldInstances(): Promise; } diff --git a/src/test/fixtures/fake-client-instance-store.ts b/src/test/fixtures/fake-client-instance-store.ts index 148a7a3a75..7f3b1085b5 100644 --- a/src/test/fixtures/fake-client-instance-store.ts +++ b/src/test/fixtures/fake-client-instance-store.ts @@ -117,7 +117,7 @@ export default class FakeClientInstanceStore implements IClientInstanceStore { this.instances.push({ createdAt: new Date(), ...details }); } - removeInstancesOlderThanTwoDays(): Promise { + removeOldInstances(): Promise { return Promise.resolve(undefined); } }