From 9af3ce4be595bbf53706187616fb1ba00d52b359 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Dec 2023 09:49:18 +0100
Subject: [PATCH 1/5] fail job instead of runtime exception

---
 app/Jobs/ContainerStatusJob.php | 3 ++-
 config/sentry.php               | 2 +-
 config/version.php              | 2 +-
 versions.json                   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 61c0cc3fe..24340aa07 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -45,7 +45,8 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         if (!$this->server->isServerReady($this->tries)) {
-            throw new \RuntimeException('Server is not reachable.');
+            $this->fail('Server is not reachable.');
+            return;
         };
         try {
             if ($this->server->isSwarm()) {
diff --git a/config/sentry.php b/config/sentry.php
index 4ac1a09af..c1a49e428 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.171',
+    'release' => '4.0.0-beta.172',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index c2306c184..57d174207 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.171';
+return '4.0.0-beta.172';
diff --git a/versions.json b/versions.json
index 62b001e63..f3aa150d5 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.171"
+            "version": "4.0.0-beta.172"
         }
     }
 }

From 62ca3ffaa53d0b6ee4e3e36b771100b078f732a5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Dec 2023 09:55:16 +0100
Subject: [PATCH 2/5] fix

---
 app/Models/Server.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index bf91f6d86..d9d38a679 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -156,6 +156,8 @@ class Server extends BaseModel
         }
         if ($this->unreachable_count < $tries) {
             $serverUptimeCheckNumber = $this->unreachable_count + 1;
+        } else {
+            $serverUptimeCheckNumber = 0;
         }
         $serverUptimeCheckNumberMax = $tries;
 

From e4c923e358428509f3d8bd1e5843d99a0a439a38 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Dec 2023 09:57:39 +0100
Subject: [PATCH 3/5] fix

---
 app/Models/Server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index d9d38a679..6f5aacc7b 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -154,11 +154,11 @@ class Server extends BaseModel
         if ($this->skipServer()) {
             return false;
         }
+        $serverUptimeCheckNumber = $this->unreachable_count;
         if ($this->unreachable_count < $tries) {
             $serverUptimeCheckNumber = $this->unreachable_count + 1;
-        } else {
-            $serverUptimeCheckNumber = 0;
         }
+
         $serverUptimeCheckNumberMax = $tries;
 
         ray('server: ' . $this->name);

From 37be4a1796d31959ea7718ebeb4854557efe0fa1 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Dec 2023 10:00:41 +0100
Subject: [PATCH 4/5] fix

---
 app/Models/Server.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 6f5aacc7b..51c49bd21 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -158,6 +158,9 @@ class Server extends BaseModel
         if ($this->unreachable_count < $tries) {
             $serverUptimeCheckNumber = $this->unreachable_count + 1;
         }
+        if ($this->unreachable_count > $tries) {
+            $serverUptimeCheckNumber = $tries;
+        }
 
         $serverUptimeCheckNumberMax = $tries;
 

From 8939d7705155122fc4765bd863955a853f2957fd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 21 Dec 2023 10:28:02 +0100
Subject: [PATCH 5/5] fix

---
 app/Jobs/ContainerStatusJob.php | 3 +--
 app/Models/Server.php           | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 24340aa07..16d0efa20 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -45,8 +45,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         if (!$this->server->isServerReady($this->tries)) {
-            $this->fail('Server is not reachable.');
-            return;
+            return 'Server is not reachable.';
         };
         try {
             if ($this->server->isSwarm()) {
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 51c49bd21..291a9d479 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -164,12 +164,11 @@ class Server extends BaseModel
 
         $serverUptimeCheckNumberMax = $tries;
 
-        ray('server: ' . $this->name);
-        ray('serverUptimeCheckNumber: ' . $serverUptimeCheckNumber);
-        ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax);
+        // ray('server: ' . $this->name);
+        // ray('serverUptimeCheckNumber: ' . $serverUptimeCheckNumber);
+        // ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax);
 
         $result = $this->validateConnection();
-        ray($result);
         if ($result) {
             if ($this->unreachable_notification_sent === true) {
                 $this->update(['unreachable_notification_sent' => false]);