Merge pull request #1564 from coollabsio/next

v4.0.0-beta.172

app/Jobs/ContainerStatusJob.php

@@ -45,7 +45,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         if (!$this->server->isServerReady($this->tries)) {
-            throw new \RuntimeException('Server is not reachable.');
+            return 'Server is not reachable.';
         };
         try {
             if ($this->server->isSwarm()) {

app/Models/Server.php

@@ -154,17 +154,21 @@ class Server extends BaseModel
         if ($this->skipServer()) {
             return 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);
+        // 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]);

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'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.171';
+return '4.0.0-beta.172';

versions.json

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