From c6278a06badc64a085c2babcdff0b743399ade92 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 7 May 2025 14:42:42 +0200
Subject: [PATCH] refactor(jobs): unify middleware configuration to prevent job
 release after expiration for DockerCleanupJob and PushServerUpdateJob

---
 app/Jobs/CleanupInstanceStuffsJob.php | 2 +-
 app/Jobs/DockerCleanupJob.php         | 2 +-
 app/Jobs/PushServerUpdateJob.php      | 2 +-
 app/Jobs/RestartProxyJob.php          | 2 +-
 app/Jobs/ServerCheckJob.php           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php
index 60ae58489..53e344daf 100644
--- a/app/Jobs/CleanupInstanceStuffsJob.php
+++ b/app/Jobs/CleanupInstanceStuffsJob.php
@@ -23,7 +23,7 @@ class CleanupInstanceStuffsJob implements ShouldBeEncrypted, ShouldBeUnique, Sho
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping('cleanup-instance-stuffs'))->expireAfter(60)->dontRelease()];
+        return [(new WithoutOverlapping('cleanup-instance-stuffs'))->dontRelease()];
     }
 
     public function handle(): void
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index 7e246649d..05a4aa8de 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -31,7 +31,7 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->expireAfter(600)];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function __construct(public Server $server, public bool $manualCleanup = false) {}
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 4d40240f9..93b203fcb 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -71,7 +71,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->expireAfter(30)];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function backoff(): int
diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php
index a70ca518c..7fc716f70 100644
--- a/app/Jobs/RestartProxyJob.php
+++ b/app/Jobs/RestartProxyJob.php
@@ -24,7 +24,7 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function __construct(public Server $server) {}
diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php
index 611402161..9818d5c6a 100644
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@@ -28,7 +28,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function __construct(public Server $server) {}