From 123e6eddd72dedaae83ce651292c7d5430c36157 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 14 Dec 2023 15:33:25 +0100
Subject: [PATCH 1/4] fix: only check server status in container status job

---
 app/Jobs/CheckLogDrainContainerJob.php | 2 +-
 app/Jobs/ServerStatusJob.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/CheckLogDrainContainerJob.php b/app/Jobs/CheckLogDrainContainerJob.php
index eb677265b..4da49b988 100644
--- a/app/Jobs/CheckLogDrainContainerJob.php
+++ b/app/Jobs/CheckLogDrainContainerJob.php
@@ -44,7 +44,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
     {
         // ray("checking log drain statuses for {$this->server->id}");
         try {
-            if (!$this->server->isServerReady()) {
+            if (!$this->server->isFunctional()) {
                 return;
             };
             $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
diff --git a/app/Jobs/ServerStatusJob.php b/app/Jobs/ServerStatusJob.php
index 9dacea95c..58f30b18d 100644
--- a/app/Jobs/ServerStatusJob.php
+++ b/app/Jobs/ServerStatusJob.php
@@ -34,7 +34,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     {
         ray("checking server status for {$this->server->id}");
         try {
-            if ($this->server->isServerReady()) {
+            if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
             }
         } catch (\Throwable $e) {

From 5d088e530e07d190fbed859f38cba07abbc7d35d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 14 Dec 2023 15:33:34 +0100
Subject: [PATCH 2/4] version++

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

diff --git a/config/sentry.php b/config/sentry.php
index b5b534784..1f1748039 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.162',
+    'release' => '4.0.0-beta.163',
     // 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 bf223006f..df172e68a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.162';
+return '4.0.0-beta.163';
diff --git a/versions.json b/versions.json
index b594596bf..473e6beef 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.162"
+            "version": "4.0.0-beta.163"
         }
     }
 }

From 06ab2145ca27f26e3a4a05fb2b9cb612eb2340db Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 14 Dec 2023 15:33:46 +0100
Subject: [PATCH 3/4] fix: improve server status check times

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

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 790b30025..1ac8bbe27 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -153,13 +153,13 @@ class Server extends BaseModel
     public function isServerReady()
     {
         $serverUptimeCheckNumber = $this->unreachable_count;
-        $serverUptimeCheckNumberMax = 3;
+        $serverUptimeCheckNumberMax = 12;
 
         $currentTime = now()->timestamp;
-        $runtime = 30;
+        $runtime = 65;
 
         $isReady = false;
-        // Run for 30 seconds max and check every 5 seconds for 3 times
+        // Run for 65 seconds max and check every 5 seconds for 12 times
         while ($currentTime + $runtime > now()->timestamp) {
             if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                 if ($this->unreachable_notification_sent === false) {

From 549446abdf67f123412b0de245e6efdef9167f4a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 14 Dec 2023 15:34:05 +0100
Subject: [PATCH 4/4] fix: handle other types of generated values

---
 bootstrap/helpers/shared.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 5e30e0f21..504bed654 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1544,6 +1544,9 @@ function generateEnvValue(string $command)
         case 'USER':
             $generatedValue = Str::random(16);
             break;
+        default:
+            $generatedValue = Str::random(16);
+            break;
     }
     return $generatedValue;
 }