From 24688b2ad80e188c5a8d1a71e94b2fe50b205e75 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:50:27 +0200
Subject: [PATCH] fix(jobs): update middleware to use expireAfter for
 WithoutOverlapping in multiple job classes

---
 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 +-
 app/Jobs/ServerPatchCheckJob.php      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php
index 53e344daf..60ae58489 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'))->dontRelease()];
+        return [(new WithoutOverlapping('cleanup-instance-stuffs'))->expireAfter(60)->dontRelease()];
     }
 
     public function handle(): void
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index 00dfd150a..519728ab0 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('docker-cleanup-'.$this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping('docker-cleanup-'.$this->server->uuid))->expireAfter(600)->dontRelease()];
     }
 
     public function __construct(public Server $server, public bool $manualCleanup = false) {}
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 65c72c8c9..61206da6f 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -70,7 +70,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping('push-server-update-'.$this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping('push-server-update-'.$this->server->uuid))->expireAfter(30)->dontRelease()];
     }
 
     public function backoff(): int
diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php
index 49cfbba53..dba4f4ac8 100644
--- a/app/Jobs/RestartProxyJob.php
+++ b/app/Jobs/RestartProxyJob.php
@@ -23,7 +23,7 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping('restart-proxy-'.$this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping('restart-proxy-'.$this->server->uuid))->expireAfter(60)->dontRelease()];
     }
 
     public function __construct(public Server $server) {}
diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php
index dcbac9ac3..499035237 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('server-check-'.$this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping('server-check-'.$this->server->uuid))->expireAfter(60)->dontRelease()];
     }
 
     public function __construct(public Server $server) {}
diff --git a/app/Jobs/ServerPatchCheckJob.php b/app/Jobs/ServerPatchCheckJob.php
index 7d1b853b1..18999c009 100644
--- a/app/Jobs/ServerPatchCheckJob.php
+++ b/app/Jobs/ServerPatchCheckJob.php
@@ -19,11 +19,11 @@ class ServerPatchCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     public $tries = 3;
 
-    public $timeout = 600; // 10 minutes timeout
+    public $timeout = 600;
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping('server-patch-check-'.$this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping('server-patch-check-'.$this->server->uuid))->expireAfter(600)->dontRelease()];
     }
 
     public function __construct(public Server $server) {}