diff --git a/server/src/config/envValidation.ts b/server/src/config/envValidation.ts index bdfacf906..05471e690 100644 --- a/server/src/config/envValidation.ts +++ b/server/src/config/envValidation.ts @@ -6,6 +6,8 @@ import { ILogger } from "@/utils/logger.js"; const envSchema = z.object({ // Server Configuration PORT: z.string().default("52345"), + // Port for worker health checks + HEALTH_PORT: z.string().default("52346"), NODE_ENV: z.enum(["development", "production", "test"]).default("development"), LOG_LEVEL: z.enum(["error", "warn", "info", "debug"]).default("debug"), diff --git a/server/src/config/services.worker.ts b/server/src/config/services.worker.ts index e3996d09c..44997af5f 100644 --- a/server/src/config/services.worker.ts +++ b/server/src/config/services.worker.ts @@ -9,6 +9,7 @@ import jmespath from "jmespath"; import * as grpc from "@grpc/grpc-js"; import * as protoLoader from "@grpc/proto-loader"; import WebSocket from "ws"; +import mongoose from "mongoose"; import { EnvConfig } from "@/domain/app-settings/app-settings.service.js"; import { SharedServices } from "@/config/services.shared.js"; @@ -132,6 +133,7 @@ export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig const worker = await DBQueueWorker.create( logger, + () => mongoose.connection.readyState === 1, jobsRepository, monitorsRepository, checksRepository, diff --git a/server/src/index.ts b/server/src/index.ts index 3b0ab6ba4..0c0a6233e 100755 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -14,6 +14,7 @@ import Logger, { ILogger } from "@/utils/logger.js"; import { SettingsService } from "@/domain/app-settings/app-settings.service.js"; import { JobScheduler } from "@/worker/worker.job-scheduler.js"; import { IJobScheduler } from "@/worker/worker.interface.js"; +import { HealthServer } from "@/worker/worker.health-server.js"; const SERVICE_NAME = "Server"; let logger: ILogger; @@ -51,8 +52,10 @@ const startApp = async () => { // *********************** if (queueMode === "worker") { const { worker } = await buildWorker(shared, envSettings); + const healthServer = new HealthServer(logger, env.HEALTH_PORT, worker); + await healthServer.listen(); logger.info({ message: "Worker instance started. API will not be started", service: SERVICE_NAME }); - initShutdownListener(null, { worker, db: shared.db, logger }); + initShutdownListener(null, { worker, db: shared.db, logger, healthServer }); return; } diff --git a/server/src/shutdown.ts b/server/src/shutdown.ts index bf77a77c9..a25d96c0e 100644 --- a/server/src/shutdown.ts +++ b/server/src/shutdown.ts @@ -3,15 +3,17 @@ import type { ILogger } from "@/utils/logger.js"; import type { Server } from "http"; import { Mongoose } from "mongoose"; import { IJobScheduler } from "@/worker/worker.interface.js"; +import { IHealthServer } from "@/worker/worker.health-server.js"; type ShutdownTargets = { worker: IJobScheduler; db: IDb; logger: ILogger; + healthServer?: IHealthServer; }; -export const initShutdownListener = (server: Server | null, services: ShutdownTargets) => { +export const initShutdownListener = (server: Server | null, shutdownTargets: ShutdownTargets) => { const SERVICE_NAME = "Server"; - const logger = services.logger; + const logger = shutdownTargets.logger; let isShuttingDown = false; @@ -24,9 +26,10 @@ export const initShutdownListener = (server: Server | null, services: ShutdownTa try { server?.close(); - await services.worker.drain(); - await services.worker.shutdown(); - await services.db.disconnect(); + await shutdownTargets.worker.drain(); + await shutdownTargets.worker.shutdown(); + await shutdownTargets.healthServer?.close(); + await shutdownTargets.db.disconnect(); logger.info({ message: "Graceful shutdown complete" }); process.exit(0); } catch (error) {