From 33370f5d1fcc714bed4c23b39070c9f8847d169b Mon Sep 17 00:00:00 2001 From: Etienne <45695613+etiennejouan@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:34:18 +0100 Subject: [PATCH] add sentry monitoring + update cron pattern to each hour (#10583) Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- .../crons/clean-suspended-workspaces.cron.pattern.ts | 2 +- .../crons/clean-suspended-workspaces.job.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.cron.pattern.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.cron.pattern.ts index dc4d2036a..3e8074842 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.cron.pattern.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.cron.pattern.ts @@ -1 +1 @@ -export const cleanSuspendedWorkspaceCronPattern = '0 22 * * *'; // Every day at 10pm +export const cleanSuspendedWorkspaceCronPattern = '0 * * * *'; // Every hour at minute 0 diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts index f5a0d45dd..07d08f7f8 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts @@ -3,10 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { WorkspaceActivationStatus } from 'twenty-shared'; import { Repository } from 'typeorm'; +import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator'; import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator'; import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; +import { cleanSuspendedWorkspaceCronPattern } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.cron.pattern'; import { CleanerWorkspaceService } from 'src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service'; @Processor(MessageQueue.cronQueue) @@ -18,6 +20,10 @@ export class CleanSuspendedWorkspacesJob { ) {} @Process(CleanSuspendedWorkspacesJob.name) + @SentryCronMonitor( + CleanSuspendedWorkspacesJob.name, + cleanSuspendedWorkspaceCronPattern, + ) async handle(): Promise { const suspendedWorkspaceIds = await this.workspaceRepository.find({ select: ['id'],