Merge pull request #1545 from coollabsio/next

v4.0.0-beta.163

app/Jobs/CheckLogDrainContainerJob.php

@@ -44,7 +44,7 @@ public function handle(): void
     {
         // 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);

app/Jobs/ServerStatusJob.php

@@ -34,7 +34,7 @@ public function handle(): void
     {
         ray("checking server status for {$this->server->id}");
         try {
-            if ($this->server->isServerReady()) {
+            if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
             }
         } catch (\Throwable $e) {

app/Models/Server.php

@@ -153,13 +153,13 @@ public function skipServer()
     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) {

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;
 }

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.162',
+    'release' => '4.0.0-beta.163',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.162';
+return '4.0.0-beta.163';

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.162"
+            "version": "4.0.0-beta.163"
         }
     }
 }