From 7bb9385af702f8a2a54cca84bae3b551de752537 Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Fri, 7 Feb 2025 09:44:30 +0200
Subject: [PATCH] UI improvements to Server Health page

---
 cp/app/Controllers/ReportsController.php      |  8 ++
 .../views/admin/reports/serverHealth.twig     | 77 +++++++++++++++----
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/cp/app/Controllers/ReportsController.php b/cp/app/Controllers/ReportsController.php
index e758ba8..f2ff97c 100644
--- a/cp/app/Controllers/ReportsController.php
+++ b/cp/app/Controllers/ReportsController.php
@@ -135,12 +135,16 @@ class ReportsController extends Controller
         $whoisStatus = $checkServiceStatus('whois');
         $rdapStatus = $checkServiceStatus('rdap');
         $dasStatus = $checkServiceStatus('das');
+        $msgbStatus = $checkServiceStatus('msg_producer');
+        $msgwStatus = $checkServiceStatus('msg_worker');
 
         // Get log lines as strings
         $eppLogs = $getLogLines('epp');
         $whoisLogs = $getLogLines('whois');
         $rdapLogs = $getLogLines('rdap');
         $dasLogs = $getLogLines('das');
+        $msgbLogs = $getLogLines('msg_producer');
+        $msgwLogs = $getLogLines('msg_worker');
 
         $system = new System();
 
@@ -206,6 +210,10 @@ class ReportsController extends Controller
             'whoisLogs' => $whoisLogs,
             'rdapLogs' => $rdapLogs,
             'dasLogs' => $dasLogs,
+            'msgbStatus' => $msgbStatus,
+            'msgwStatus' => $msgwStatus,
+            'msgbLogs' => $msgbLogs,
+            'msgwLogs' => $msgwLogs,
         ]);
     }
 
diff --git a/cp/resources/views/admin/reports/serverHealth.twig b/cp/resources/views/admin/reports/serverHealth.twig
index e5541f1..1689cf8 100644
--- a/cp/resources/views/admin/reports/serverHealth.twig
+++ b/cp/resources/views/admin/reports/serverHealth.twig
@@ -113,74 +113,97 @@
                     </div>
                     
                     <!-- EPP Card -->
-                    <div class="col-md-3">
+                    <div class="col-md-4">
                         <div class="card">
                             <div class="card-body">
-                                <div class="d-flex align-items-center">
+                                <div class="d-flex align-items-center flex-wrap">
                                     <div class="subheader me-2">{{ __('EPP Server') }}:</div>
                                     <span class="status {{ eppStatus == 'Running' ? 'status-green' : 'status-red' }}">
                                         <span class="status-dot status-dot-animated"></span>
                                         {{ eppStatus == 'Running' ? __('Running') : __('Stopped') }}
                                     </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service epp restart</code></div>
                                 </div>
                             </div>
                         </div>
                     </div>
                     
                     <!-- RDAP Card -->
-                    <div class="col-md-3">
+                    <div class="col-md-4">
                         <div class="card">
                             <div class="card-body">
-                                <div class="d-flex align-items-center">
+                                <div class="d-flex align-items-center flex-wrap">
                                     <div class="subheader me-2">{{ __('RDAP Server') }}:</div>
                                     <span class="status {{ rdapStatus == 'Running' ? 'status-green' : 'status-red' }}">
                                         <span class="status-dot status-dot-animated"></span>
                                         {{ rdapStatus == 'Running' ? __('Running') : __('Stopped') }}
                                     </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service rdap restart</code></div>
                                 </div>
                             </div>
                         </div>
                     </div>
                     
                     <!-- WHOIS Card -->
-                    <div class="col-md-3">
+                    <div class="col-md-4">
                         <div class="card">
                             <div class="card-body">
-                                <div class="d-flex align-items-center">
+                                <div class="d-flex align-items-center flex-wrap">
                                     <div class="subheader me-2">{{ __('WHOIS Server') }}:</div>
                                     <span class="status {{ whoisStatus == 'Running' ? 'status-green' : 'status-red' }}">
                                         <span class="status-dot status-dot-animated"></span>
                                         {{ whoisStatus == 'Running' ? __('Running') : __('Stopped') }}
                                     </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service whois restart</code></div>
                                 </div>
                             </div>
                         </div>
                     </div>
                     
                     <!-- DAS Card -->
-                    <div class="col-md-3">
+                    <div class="col-md-4">
                         <div class="card">
                             <div class="card-body">
-                                <div class="d-flex align-items-center">
+                                <div class="d-flex align-items-center flex-wrap">
                                     <div class="subheader me-2">{{ __('DAS Server') }}:</div>
                                     <span class="status {{ dasStatus == 'Running' ? 'status-green' : 'status-red' }}">
                                         <span class="status-dot status-dot-animated"></span>
                                         {{ dasStatus == 'Running' ? __('Running') : __('Stopped') }}
                                     </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service das restart</code></div>
                                 </div>
                             </div>
                         </div>
                     </div>
-
-                    <div class="col-md-12">
+                    
+                    <!-- Msg_Producer Card -->
+                    <div class="col-md-4">
                         <div class="card">
                             <div class="card-body">
-                                <p>
-                                    {{ __('If you encounter an issue with a specific service, log in via SSH and run the appropriate command to reload it:') }} <code>service epp restart</code>, <code>service whois restart</code>, <code>service rdap restart</code>, <code>service das restart</code>
-                                </p>
-                                <p class="text-muted">
-                                    {{ __('If you need assistance, please contact support.') }}
-                                </p>
+                                <div class="d-flex align-items-center flex-wrap">
+                                    <div class="subheader me-2">{{ __('Message Producer') }}:</div>
+                                    <span class="status {{ msgbStatus == 'Running' ? 'status-green' : 'status-red' }}">
+                                        <span class="status-dot status-dot-animated"></span>
+                                        {{ msgbStatus == 'Running' ? __('Running') : __('Stopped') }}
+                                    </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service msg_producer restart</code></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <!-- Msg_Worker Card -->
+                    <div class="col-md-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <div class="d-flex align-items-center flex-wrap">
+                                    <div class="subheader me-2">{{ __('Message Worker') }}:</div>
+                                    <span class="status {{ msgwStatus == 'Running' ? 'status-green' : 'status-red' }}">
+                                        <span class="status-dot status-dot-animated"></span>
+                                        {{ msgwStatus == 'Running' ? __('Running') : __('Stopped') }}
+                                    </span>
+                                    <div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service msg_worker restart</code></div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -228,6 +251,28 @@
                             </div>
                         </div>
                     </div>
+                    
+                    <div class="col-md-6">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">{{ __('Msg_Producer Log') }}</h3>
+                            </div>
+                            <div class="card-body">
+                                <pre style="white-space: pre-wrap;">{{ msgbLogs|raw }}</pre>
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <div class="col-md-6">
+                        <div class="card">
+                            <div class="card-header">
+                                <h3 class="card-title">{{ __('Msg_Broker Log') }}</h3>
+                            </div>
+                            <div class="card-body">
+                                <pre style="white-space: pre-wrap;">{{ msgwLogs|raw }}</pre>
+                            </div>
+                        </div>
+                    </div>
                 </div>
           </div>
         </div>