diff --git a/server/src/worker/worker.db-queue.ts b/server/src/worker/worker.db-queue.ts index 24138695f..5e1a74bb4 100644 --- a/server/src/worker/worker.db-queue.ts +++ b/server/src/worker/worker.db-queue.ts @@ -137,23 +137,16 @@ export class DBQueueWorker implements IWorker { private toSummary = (job: Job): WorkerJobSummary => ({ monitorId: job.refId ?? job.id, - monitorUrl: null, // Jobs don't have URL monitorType: job.type, monitorInterval: job.intervalMs, - monitorGeoInterval: null, monitorActive: job.isActive, - active: job.isActive, lockedBy: job.lockedBy, lockedUntil: job.lockedUntil, - lockedAt: null, // no lockedAt + nextScheduledAt: job.nextScheduledAt, runCount: job.runCount, failCount: job.failCount, failReason: job.lastFailReason, - lastRunAt: null, // not tracked lastFinishedAt: job.lastFinishedAt, - lastRunTook: null, // not tracked - lastFailedAt: null, // not tracked - repeat: job.intervalMs, }); // ******************** diff --git a/server/src/worker/worker.interface.ts b/server/src/worker/worker.interface.ts index fd4160124..6dd360e50 100644 --- a/server/src/worker/worker.interface.ts +++ b/server/src/worker/worker.interface.ts @@ -34,23 +34,16 @@ export type WorkerMetrics = { export type WorkerJobSummary = { monitorId: string | number; - monitorUrl: string | null; monitorType: string | null; monitorInterval: number | null; - monitorGeoInterval: number | null; monitorActive: boolean | null; - active: boolean; lockedBy: string | null; lockedUntil: number | null; - lockedAt: number | null; + nextScheduledAt: number; runCount: number; failCount: number; failReason: string | null; - lastRunAt: number | null; lastFinishedAt: number | null; - lastRunTook: number | null; - lastFailedAt: number | null; - repeat: number | null; }; export type WorkerJobsPagination = {