From 581930d8c65c9f0f3fe7df4777833a3637bf042b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 3 May 2023 09:43:01 +0200
Subject: [PATCH] update server check

---
 app/Http/Livewire/Server/Form.php              | 14 +++++++++++---
 resources/views/livewire/server/form.blade.php | 11 +++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php
index 136d37b98..8c75f887e 100644
--- a/app/Http/Livewire/Server/Form.php
+++ b/app/Http/Livewire/Server/Form.php
@@ -38,12 +38,20 @@ class Form extends Component
     public function checkServer()
     {
         try {
-
-            $this->uptime = instantRemoteProcess(['uptime'], $this->server);
+            $this->uptime = instantRemoteProcess(['uptime'], $this->server, false);
+            if (!$this->uptime) {
+                $this->uptime = 'Server not reachable.';
+                throw new \Exception('Server not reachable.');
+            }
             $this->dockerVersion = instantRemoteProcess(['docker version|head -2|grep -i version'], $this->server, false);
+            if (!$this->dockerVersion) {
+                $this->dockerVersion = 'Not installed.';
+            }
             $this->dockerComposeVersion = instantRemoteProcess(['docker compose version|head -2|grep -i version'], $this->server, false);
+            if (!$this->dockerComposeVersion) {
+                $this->dockerComposeVersion = 'Not installed.';
+            }
         } catch (\Exception $e) {
-            $this->addError('server.ip', $e->getMessage());
         }
     }
     public function submit()
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 94689a045..77af63b9a 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -22,14 +22,17 @@
                 Submit
             </button>
             <button wire:click.prevent='checkServer'>Check Server</button>
-            <button wire:click.prevent='installDocker'>Install Docker</button>
+            {{-- <button wire:click.prevent='installDocker'>Install Docker</button> --}}
         </div>
     </form>
     @isset($uptime)
-        <p>Connection OK</p>
         <p>Uptime: {{ $uptime }}</p>
-        <p>{{ $dockerVersion }}</p>
-        <p>{{ $dockerComposeVersion }}</p>
+    @endisset
+    @isset($dockerVersion)
+        <p>Docker Engine: {{ $dockerVersion }}</p>
+    @endisset
+    @isset($dockerComposeVersion)
+        <p>Docker Compose: {{ $dockerComposeVersion }}</p>
     @endisset
 
 </div>