From ae4c43324610594c0724102661a6f15825ae25fd Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 15 Jun 2026 11:02:46 -0700 Subject: [PATCH] add a feature flag to toggle primary worker processing jobs or not --- server/src/config/envValidation.ts | 6 ++--- server/src/config/services.ts | 3 ++- .../app-settings/app-settings.service.ts | 6 ++--- .../domain/app-settings/app-settings.type.ts | 3 --- server/src/worker/worker.db-queue.ts | 22 ++++++++++++------- server/src/worker/worker.interface.ts | 1 - 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/server/src/config/envValidation.ts b/server/src/config/envValidation.ts index 9d83336dc..4497119f8 100644 --- a/server/src/config/envValidation.ts +++ b/server/src/config/envValidation.ts @@ -1,5 +1,5 @@ -import { z } from "zod"; -import { DbTypes, QueueTypes, QueueModes } from "@/domain/app-settings/app-settings.type.js"; +import { boolean, z } from "zod"; +import { DbTypes, QueueModes } from "@/domain/app-settings/app-settings.type.js"; import { booleanCoercion } from "@/api/validation/shared.js"; const envSchema = z.object({ @@ -12,8 +12,8 @@ const envSchema = z.object({ DB_CONNECTION_STRING: z.string().min(1, "Database connection string is required"), DB_TYPE: z.enum(DbTypes).default("mongodb"), - QUEUE_TYPE: z.enum(QueueTypes).default("superSimpleQueue"), QUEUE_MODE: z.enum(QueueModes).default("primary"), + QUEUE_PRIMARY_PROCESSES: booleanCoercion.default(true), // JWT Authentication JWT_SECRET: z.string().min(1, "JWT_SECRET is required"), diff --git a/server/src/config/services.ts b/server/src/config/services.ts index 74a73ad7e..341e7da2f 100644 --- a/server/src/config/services.ts +++ b/server/src/config/services.ts @@ -301,7 +301,8 @@ export const initializeServices = async ({ geoCheckPipeline, reactorDispatcher, workerHelper, - envSettings.queueMode + envSettings.queueMode, + envSettings.queuePrimaryProcesses ); // Business services diff --git a/server/src/domain/app-settings/app-settings.service.ts b/server/src/domain/app-settings/app-settings.service.ts index ef14a932b..8beb65d84 100755 --- a/server/src/domain/app-settings/app-settings.service.ts +++ b/server/src/domain/app-settings/app-settings.service.ts @@ -1,5 +1,5 @@ import { ISettingsRepository } from "@/domain/app-settings/app-settings-repository.interface.js"; -import { Settings, SettingsUpdate, type DbType, type QueueMode, type QueueType } from "@/domain/app-settings/app-settings.type.js"; +import { Settings, SettingsUpdate, type DbType, type QueueMode } from "@/domain/app-settings/app-settings.type.js"; import { AppError } from "@/utils/AppError.js"; import { ValidatedEnv } from "@/config/envValidation.js"; import type { StringValue } from "ms"; @@ -13,8 +13,8 @@ export type EnvConfig = { clientHost: string; dbConnectionString: string; dbType: DbType; - queueType: QueueType; queueMode: QueueMode; + queuePrimaryProcesses: boolean; statusPageThemesEnabled: boolean; }; @@ -41,8 +41,8 @@ export class SettingsService implements ISettingsService { clientHost: env.CLIENT_HOST, dbConnectionString: env.DB_CONNECTION_STRING, dbType: env.DB_TYPE, - queueType: env.QUEUE_TYPE, queueMode: env.QUEUE_MODE, + queuePrimaryProcesses: env.QUEUE_PRIMARY_PROCESSES, statusPageThemesEnabled: env.STATUS_PAGE_THEMES_ENABLED, }; } diff --git a/server/src/domain/app-settings/app-settings.type.ts b/server/src/domain/app-settings/app-settings.type.ts index 7b0216548..8cb52e93d 100644 --- a/server/src/domain/app-settings/app-settings.type.ts +++ b/server/src/domain/app-settings/app-settings.type.ts @@ -1,9 +1,6 @@ export const DbTypes = ["mongodb"] as const; export type DbType = (typeof DbTypes)[number]; -export const QueueTypes = ["lessSimpleQueue", "superSimpleQueue", "dbQueue"] as const; -export type QueueType = (typeof QueueTypes)[number]; - export const QueueModes = ["primary", "worker"] as const; export type QueueMode = (typeof QueueModes)[number]; diff --git a/server/src/worker/worker.db-queue.ts b/server/src/worker/worker.db-queue.ts index 62d2ca7e5..9331a6927 100644 --- a/server/src/worker/worker.db-queue.ts +++ b/server/src/worker/worker.db-queue.ts @@ -13,7 +13,7 @@ import { ICheckEvaluator } from "@/worker/worker.check-evaluator.js"; import { ICheckPipeline } from "@/worker/worker.check-pipeline.js"; import { IReactorDispatcher } from "@/worker/reactors/reactor.dispatcher.js"; import { IWorkerHelper } from "@/worker/worker.helper.js"; -import { QueueMode, QueueModes } from "@/domain/app-settings/app-settings.type.js"; +import { QueueMode } from "@/domain/app-settings/app-settings.type.js"; const SERVICE_NAME = "JobQueue"; const POLL_MS = 250; const CLEANUP_INTERVAL_MS = 24 * 60 * 60 * 1000; @@ -49,7 +49,8 @@ export class DBQueueWorker implements IWorker { private geoCheckPipeline: ICheckPipeline, private dispatcher: IReactorDispatcher, private helper: IWorkerHelper, - private mode: QueueMode + private queueMode: QueueMode, + private queuePrimaryProcesses: boolean ) {} get serviceName() { @@ -67,7 +68,8 @@ export class DBQueueWorker implements IWorker { geoCheckPipeline: ICheckPipeline, dispatcher: IReactorDispatcher, helper: IWorkerHelper, - mode: QueueMode + queueMode: QueueMode, + queuePrimaryProcesses: boolean ): Promise { const instance = new DBQueueWorker( logger, @@ -80,7 +82,8 @@ export class DBQueueWorker implements IWorker { geoCheckPipeline, dispatcher, helper, - mode + queueMode, + queuePrimaryProcesses ); await instance.init(); return instance; @@ -246,16 +249,19 @@ export class DBQueueWorker implements IWorker { init = async () => { this.stopped = false; - if (this.mode === "primary") { + + if (this.queueMode === "primary") { await this.reconcile(); - return true; - } else { + } + + if (this.queuePrimaryProcesses === true || this.queueMode === "worker") { for (const type of Object.keys(this.inFlight) as JobType[]) { this.startLoop(type); } } return true; }; + addJob = async (_monitorId: string, monitor: Monitor) => { const now = Date.now(); await this.jobsRepository.upsertJob(this.toCheckJob(monitor, now)); @@ -315,7 +321,7 @@ export class DBQueueWorker implements IWorker { jobsWithFailures: [], totalRuns: 0, totalFailures: 0, - workers: [{ workerId: this.workerId, mode: this.mode, lastSeenAt: now }], + workers: [{ workerId: this.workerId, mode: this.queueMode, lastSeenAt: now }], } ); }; diff --git a/server/src/worker/worker.interface.ts b/server/src/worker/worker.interface.ts index 5d1ccf97f..3b5eb0bd7 100644 --- a/server/src/worker/worker.interface.ts +++ b/server/src/worker/worker.interface.ts @@ -1,5 +1,4 @@ import { Monitor } from "@/domain/monitors/monitor.types.js"; -import { QueueWorker } from "@/domain/queue-workers/queue-worker.type.js"; import { Check } from "@/domain/checks/check.type.js"; import { MonitorPayloadMap, MonitorStatusResponse, StatusChangeResult } from "@/types/network.js"; import { MonitorActionDecision } from "@/worker/worker.helper.js";