From 8004a40139f3c3d7c2d2a5d89d883ebe6f7ee596 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 9 Oct 2023 11:49:38 +0200
Subject: [PATCH] updates

---
 app/Jobs/ContainerStatusJob.php     |  4 +-
 bootstrap/helpers/remoteProcess.php | 98 ++++++++++++++---------------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 7d68233ce..8156939e5 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -53,7 +53,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                     if ($this->server->unreachable_email_sent === false) {
                         ray('Server unreachable, sending notification...');
-                        $this->server->team->notify(new Unreachable($this->server));
+                        // $this->server->team->notify(new Unreachable($this->server));
                     }
                     $this->server->settings()->update([
                         'is_reachable' => false,
@@ -70,7 +70,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             }
             if (data_get($this->server, 'unreachable_email_sent') === true) {
                 ray('Server is reachable again, sending notification...');
-                $this->server->team->notify(new Revived($this->server));
+                // $this->server->team->notify(new Revived($this->server));
                 $this->server->update(['unreachable_email_sent' => false]);
             }
             if (
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index 8aa22d6f2..b32db5b2c 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -180,55 +180,55 @@ function refresh_server_connection(PrivateKey $private_key)
     }
 }
 
-function validateServer(Server $server, bool $throwError = false)
-{
-    try {
-        $uptime = instant_remote_process(['uptime'], $server, $throwError);
-        if (!$uptime) {
-            $server->settings->is_reachable = false;
-            $server->team->notify(new Unreachable($server));
-            $server->unreachable_email_sent = true;
-            $server->save();
-            return [
-                "uptime" => null,
-                "dockerVersion" => null,
-            ];
-        }
-        $server->settings->is_reachable = true;
-        instant_remote_process(["docker ps"], $server, $throwError);
-        $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $server, $throwError);
-        if (!$dockerVersion) {
-            $dockerVersion = null;
-            return [
-                "uptime" => $uptime,
-                "dockerVersion" => null,
-            ];
-        }
-        $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
-        if (is_null($dockerVersion)) {
-            $server->settings->is_usable = false;
-        } else {
-            $server->settings->is_usable = true;
-            if (data_get($server, 'unreachable_email_sent') === true) {
-                $server->team->notify(new Revived($server));
-                $server->unreachable_email_sent = false;
-                $server->save();
-            }
-        }
-        return [
-            "uptime" => $uptime,
-            "dockerVersion" => $dockerVersion,
-        ];
-    } catch (\Throwable $e) {
-        $server->settings->is_reachable = false;
-        $server->settings->is_usable = false;
-        throw $e;
-    } finally {
-        if (data_get($server, 'settings')) {
-            $server->settings->save();
-        }
-    }
-}
+// function validateServer(Server $server, bool $throwError = false)
+// {
+//     try {
+//         $uptime = instant_remote_process(['uptime'], $server, $throwError);
+//         if (!$uptime) {
+//             $server->settings->is_reachable = false;
+//             $server->team->notify(new Unreachable($server));
+//             $server->unreachable_email_sent = true;
+//             $server->save();
+//             return [
+//                 "uptime" => null,
+//                 "dockerVersion" => null,
+//             ];
+//         }
+//         $server->settings->is_reachable = true;
+//         instant_remote_process(["docker ps"], $server, $throwError);
+//         $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $server, $throwError);
+//         if (!$dockerVersion) {
+//             $dockerVersion = null;
+//             return [
+//                 "uptime" => $uptime,
+//                 "dockerVersion" => null,
+//             ];
+//         }
+//         $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
+//         if (is_null($dockerVersion)) {
+//             $server->settings->is_usable = false;
+//         } else {
+//             $server->settings->is_usable = true;
+//             if (data_get($server, 'unreachable_email_sent') === true) {
+//                 $server->team->notify(new Revived($server));
+//                 $server->unreachable_email_sent = false;
+//                 $server->save();
+//             }
+//         }
+//         return [
+//             "uptime" => $uptime,
+//             "dockerVersion" => $dockerVersion,
+//         ];
+//     } catch (\Throwable $e) {
+//         $server->settings->is_reachable = false;
+//         $server->settings->is_usable = false;
+//         throw $e;
+//     } finally {
+//         if (data_get($server, 'settings')) {
+//             $server->settings->save();
+//         }
+//     }
+// }
 
 function checkRequiredCommands(Server $server)
 {