From 424a6b04282c8ff1be4651d27463967f95905f54 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 3 May 2024 13:31:35 +0200
Subject: [PATCH] revert server checking fn

---
 app/Jobs/ServerStatusJob.php |   2 +-
 app/Models/Server.php        | 102 ++++++++++++++++++-----------------
 config/sentry.php            |   2 +-
 config/version.php           |   2 +-
 versions.json                |   2 +-
 5 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/app/Jobs/ServerStatusJob.php b/app/Jobs/ServerStatusJob.php
index d91961bcb..63033d7b8 100644
--- a/app/Jobs/ServerStatusJob.php
+++ b/app/Jobs/ServerStatusJob.php
@@ -17,7 +17,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public int|string|null $disk_usage = null;
-    public $tries = 4;
+    public $tries = 3;
     public function backoff(): int
     {
         return isDev() ? 1 : 3;
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 54cc134aa..19da8d784 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -10,7 +10,6 @@
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Sleep;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -468,53 +467,63 @@ public function isServerReady(int $tries = 3)
         if ($this->skipServer()) {
             return false;
         }
-        $checkIteration = 1;
-        $isServerReady = false;
-        while ($checkIteration < $tries) {
-            ['uptime' => $uptime] = $this->validateConnection();
-            if ($uptime) {
-                if ($this->unreachable_notification_sent === true) {
-                    $this->update(['unreachable_notification_sent' => false]);
+        $serverUptimeCheckNumber = $this->unreachable_count;
+        if ($this->unreachable_count < $tries) {
+            $serverUptimeCheckNumber = $this->unreachable_count + 1;
+        }
+        if ($this->unreachable_count > $tries) {
+            $serverUptimeCheckNumber = $tries;
+        }
+
+        $serverUptimeCheckNumberMax = $tries;
+
+        // ray('server: ' . $this->name);
+        // ray('serverUptimeCheckNumber: ' . $serverUptimeCheckNumber);
+        // ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax);
+
+        ['uptime' => $uptime] = $this->validateConnection();
+        if ($uptime) {
+            if ($this->unreachable_notification_sent === true) {
+                $this->update(['unreachable_notification_sent' => false]);
+            }
+            return true;
+        } else {
+            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
+                // Reached max number of retries
+                if ($this->unreachable_notification_sent === false) {
+                    ray('Server unreachable, sending notification...');
+                    $this->team?->notify(new Unreachable($this));
+                    $this->update(['unreachable_notification_sent' => true]);
+                }
+                if ($this->settings->is_reachable === true) {
+                    $this->settings()->update([
+                        'is_reachable' => false,
+                    ]);
+                }
+
+                foreach ($this->applications() as $application) {
+                    $application->update(['status' => 'exited']);
+                }
+                foreach ($this->databases() as $database) {
+                    $database->update(['status' => 'exited']);
+                }
+                foreach ($this->services()->get() as $service) {
+                    $apps = $service->applications()->get();
+                    $dbs = $service->databases()->get();
+                    foreach ($apps as $app) {
+                        $app->update(['status' => 'exited']);
+                    }
+                    foreach ($dbs as $db) {
+                        $db->update(['status' => 'exited']);
+                    }
                 }
-                $this->settings()->update([
-                    'is_reachable' => true,
-                ]);
-                $isServerReady = true;
-                break;
             } else {
-                ray('Server is not ready yet.');
-                $checkIteration++;
-                Sleep::for(10)->seconds();
+                $this->update([
+                    'unreachable_count' => $this->unreachable_count + 1,
+                ]);
             }
+            return false;
         }
-        if ($isServerReady) {
-            return $isServerReady;
-        }
-        if ($this->unreachable_notification_sent === false) {
-            ray('Server unreachable, sending notification...');
-            $this->team?->notify(new Unreachable($this));
-            $this->update(['unreachable_notification_sent' => true]);
-        }
-        $this->settings()->update([
-            'is_reachable' => false,
-        ]);
-        foreach ($this->applications() as $application) {
-            $application->update(['status' => 'exited']);
-        }
-        foreach ($this->databases() as $database) {
-            $database->update(['status' => 'exited']);
-        }
-        foreach ($this->services()->get() as $service) {
-            $apps = $service->applications()->get();
-            $dbs = $service->databases()->get();
-            foreach ($apps as $app) {
-                $app->update(['status' => 'exited']);
-            }
-            foreach ($dbs as $db) {
-                $db->update(['status' => 'exited']);
-            }
-        }
-        return false;
     }
     public function getDiskUsage()
     {
@@ -762,11 +771,6 @@ public function validateConnection()
             $server->settings()->update([
                 'is_reachable' => false,
             ]);
-            if (data_get($server, 'unreachable_notification_sent') === false) {
-                ray('Server unreachable, sending notification...');
-                $this->team?->notify(new Unreachable($this));
-                $this->update(['unreachable_notification_sent' => true]);
-            }
             return ['uptime' => false, 'error' => $e->getMessage()];
         }
     }
diff --git a/config/sentry.php b/config/sentry.php
index 6629fefab..633e5bcd6 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // 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.273',
+    'release' => '4.0.0-beta.274',
     // 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 a5706892f..3cb55c8fd 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.273';
+return '4.0.0-beta.274';
diff --git a/versions.json b/versions.json
index fee22c51d..2225d2fbc 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.273"
+            "version": "4.0.0-beta.274"
         }
     }
 }