refactor(deployments): enhance deployment worker and queue handling for cloud environments

- Refactored the deployment worker to create a no-op worker when Redis is disabled (e.g., IS_CLOUD), preventing BullMQ connection errors.
- Updated queue initialization to use a no-op queue in cloud environments, ensuring compatibility and stability.
- Improved error handling and logging for job processing in the deployment worker.
This commit is contained in:
Mauricio Siu
2026-02-10 03:11:33 -06:00
parent 17da1d5b3c
commit 744ebab15a
2 changed files with 102 additions and 75 deletions
@@ -2,6 +2,7 @@ import {
deployApplication, deployApplication,
deployCompose, deployCompose,
deployPreviewApplication, deployPreviewApplication,
IS_CLOUD,
rebuildApplication, rebuildApplication,
rebuildCompose, rebuildCompose,
rebuildPreviewApplication, rebuildPreviewApplication,
@@ -13,7 +14,8 @@ import { type Job, Worker } from "bullmq";
import type { DeploymentJob } from "./queue-types"; import type { DeploymentJob } from "./queue-types";
import { redisConfig } from "./redis-connection"; import { redisConfig } from "./redis-connection";
export const deploymentWorker = new Worker( const createDeploymentWorker = () =>
new Worker(
"deployments", "deployments",
async (job: Job<DeploymentJob>) => { async (job: Job<DeploymentJob>) => {
try { try {
@@ -80,3 +82,15 @@ export const deploymentWorker = new Worker(
connection: redisConfig, connection: redisConfig,
}, },
); );
/** No-op worker when Redis is disabled (e.g. IS_CLOUD). Avoids BullMQ connection errors. */
const noopWorker = {
run: () => Promise.resolve(),
close: () => Promise.resolve(),
cancelJob: () => Promise.resolve(),
cancelAllJobs: () => Promise.resolve(),
};
export const deploymentWorker = !IS_CLOUD
? createDeploymentWorker()
: (noopWorker as unknown as Worker<DeploymentJob>);
+15 -2
View File
@@ -1,15 +1,26 @@
import { IS_CLOUD } from "@dokploy/server";
import { import {
execAsync, execAsync,
execAsyncRemote, execAsyncRemote,
} from "@dokploy/server/utils/process/execAsync"; } from "@dokploy/server/utils/process/execAsync";
import type { Job } from "bullmq";
import { Queue } from "bullmq"; import { Queue } from "bullmq";
import { deploymentWorker } from "./deployments-queue"; import { deploymentWorker } from "./deployments-queue";
import { redisConfig } from "./redis-connection"; import { redisConfig } from "./redis-connection";
const myQueue = new Queue("deployments", { /** No-op queue when Redis is disabled (e.g. IS_CLOUD). Avoids BullMQ connection errors. */
connection: redisConfig, const createNoopQueue = () => ({
getJobs: () => Promise.resolve([] as Job[]),
add: () =>
Promise.resolve({ id: "noop", remove: () => Promise.resolve() } as Job),
close: () => Promise.resolve(),
on: () => {},
}); });
const myQueue = !IS_CLOUD
? new Queue("deployments", { connection: redisConfig })
: (createNoopQueue() as unknown as Queue);
export const getJobsByApplicationId = async (applicationId: string) => { export const getJobsByApplicationId = async (applicationId: string) => {
const jobs = await myQueue.getJobs(); const jobs = await myQueue.getJobs();
return jobs.filter((job) => job?.data?.applicationId === applicationId); return jobs.filter((job) => job?.data?.applicationId === applicationId);
@@ -20,6 +31,7 @@ export const getJobsByComposeId = async (composeId: string) => {
return jobs.filter((job) => job?.data?.composeId === composeId); return jobs.filter((job) => job?.data?.composeId === composeId);
}; };
if (!IS_CLOUD) {
process.on("SIGTERM", () => { process.on("SIGTERM", () => {
myQueue.close(); myQueue.close();
process.exit(0); process.exit(0);
@@ -33,6 +45,7 @@ myQueue.on("error", (error) => {
); );
} }
}); });
}
export const cleanQueuesByApplication = async (applicationId: string) => { export const cleanQueuesByApplication = async (applicationId: string) => {
const jobs = await myQueue.getJobs(["waiting", "delayed"]); const jobs = await myQueue.getJobs(["waiting", "delayed"]);