From 6fa8f632771f096fcea2771a7faa857af2158af2 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 27 Sep 2025 02:20:07 -0600
Subject: [PATCH] fix(deployment): correct deployment cancellation logic and
 ensure proper status update

- Updated the initCancelDeployments function to set the status of running deployments to 'cancelled' instead of 'error'.
- Reintroduced the call to initCancelDeployments in the server initialization process to ensure cancellations are handled correctly.
---
 apps/dokploy/server/server.ts                            | 2 +-
 packages/server/src/utils/startup/cancell-deployments.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts
index eaf562695..d06ab38f1 100644
--- a/apps/dokploy/server/server.ts
+++ b/apps/dokploy/server/server.ts
@@ -43,6 +43,7 @@ void app.prepare().then(async () => {
 		if (!IS_CLOUD) {
 			setupDockerStatsMonitoringSocketServer(server);
 		}
+		await initCancelDeployments();
 
 		if (process.env.NODE_ENV === "production" && !IS_CLOUD) {
 			setupDirectories();
@@ -53,7 +54,6 @@ void app.prepare().then(async () => {
 			await migration();
 			await initCronJobs();
 			await initSchedules();
-			await initCancelDeployments();
 			await initVolumeBackupsCronJobs();
 			await sendDokployRestartNotifications();
 		}
diff --git a/packages/server/src/utils/startup/cancell-deployments.ts b/packages/server/src/utils/startup/cancell-deployments.ts
index df7b70900..16e76a32c 100644
--- a/packages/server/src/utils/startup/cancell-deployments.ts
+++ b/packages/server/src/utils/startup/cancell-deployments.ts
@@ -7,8 +7,8 @@ export const initCancelDeployments = async () => {
         console.log("Setting up cancel deployments....");
 
     const result = await db.update(deployments).set({
-        status: "error",
-    }).where(eq(deployments.status, "cancelled"));
+        status: "cancelled",
+    }).where(eq(deployments.status, "running")).returning();
 
     console.log(`Cancelled ${result.length} deployments`);
     } catch (error) {