diff --git a/cp/app/Controllers/ReportsController.php b/cp/app/Controllers/ReportsController.php index a513b01..e758ba8 100644 --- a/cp/app/Controllers/ReportsController.php +++ b/cp/app/Controllers/ReportsController.php @@ -107,9 +107,40 @@ class ReportsController extends Controller if ($_SESSION["auth_roles"] != 0) { return $response->withHeader('Location', '/dashboard')->withStatus(302); } - + $csrfTokenName = $this->container->get('csrf')->getTokenName(); $csrfTokenValue = $this->container->get('csrf')->getTokenValue(); + + // Helper function to check service status + $checkServiceStatus = function ($serviceName) { + $output = @shell_exec("service $serviceName status"); + return ($output && strpos($output, 'active (running)') !== false) ? 'Running' : 'Stopped'; + }; + + // Helper function to read the last 50 lines of a log file and convert to string + $getLogLines = function ($logPrefix) { + $currentDate = date('Y-m-d'); + $logFile = "/var/log/namingo/{$logPrefix}-$currentDate.log"; + + if (file_exists($logFile)) { + $output = @shell_exec("tail -n 50 " . escapeshellarg($logFile)); + return $output ? $output : "Log file is empty."; + } + + return "Log file not found: $logFile"; + }; + + // Check statuses + $eppStatus = $checkServiceStatus('epp'); + $whoisStatus = $checkServiceStatus('whois'); + $rdapStatus = $checkServiceStatus('rdap'); + $dasStatus = $checkServiceStatus('das'); + + // Get log lines as strings + $eppLogs = $getLogLines('epp'); + $whoisLogs = $getLogLines('whois'); + $rdapLogs = $getLogLines('rdap'); + $dasLogs = $getLogLines('das'); $system = new System(); @@ -167,6 +198,14 @@ class ReportsController extends Controller 'csrfTokenName' => $csrfTokenName, 'csrfTokenValue' => $csrfTokenValue, 'backupLog' => nl2br(htmlspecialchars($backupSummary)), + 'eppStatus' => $eppStatus, + 'whoisStatus' => $whoisStatus, + 'rdapStatus' => $rdapStatus, + 'dasStatus' => $dasStatus, + 'eppLogs' => $eppLogs, + 'whoisLogs' => $whoisLogs, + 'rdapLogs' => $rdapLogs, + 'dasLogs' => $dasLogs, ]); } diff --git a/cp/resources/views/admin/reports/serverHealth.twig b/cp/resources/views/admin/reports/serverHealth.twig index 65dda2e..e5541f1 100644 --- a/cp/resources/views/admin/reports/serverHealth.twig +++ b/cp/resources/views/admin/reports/serverHealth.twig @@ -36,13 +36,12 @@
-
-
- -
+
+ +
-

{{ __('CPU and Memory') }}

+

{{ __('CPU Usage') }}

@@ -59,10 +58,18 @@ {{ serverHealth.getCPUUsage }}%
- -
- -
+
+
+
+ + +
+
+
+

{{ __('Memory Usage') }}

+
+
+

{{ __('Memory') }}

{{ serverHealth.getMemoryFree }} {{ __('MB free of') }} {{ serverHealth.getMemoryTotal }} MB
@@ -80,16 +87,16 @@
- -
+ +
-

{{ __('Disk and Network') }}

+

{{ __('Disk Usage') }}

-

{{ __('Disk Usage') }}

+

{{ __('Disk') }}

{{ serverHealth.getDiskFree }} {{ __('GB free of') }} {{ serverHealth.getDiskTotal }} GB
@@ -104,21 +111,124 @@
-
+ + +
+
+
+
+
{{ __('EPP Server') }}:
+ + + {{ eppStatus == 'Running' ? __('Running') : __('Stopped') }} + +
+
+
+
+ + +
+
+
+
+
{{ __('RDAP Server') }}:
+ + + {{ rdapStatus == 'Running' ? __('Running') : __('Stopped') }} + +
+
+
+
+ + +
+
+
+
+
{{ __('WHOIS Server') }}:
+ + + {{ whoisStatus == 'Running' ? __('Running') : __('Stopped') }} + +
+
+
+
+ + +
+
+
+
+
{{ __('DAS Server') }}:
+ + + {{ dasStatus == 'Running' ? __('Running') : __('Stopped') }} + +
+
+
+
-
+
+
+

+ {{ __('If you encounter an issue with a specific service, log in via SSH and run the appropriate command to reload it:') }} service epp restart, service whois restart, service rdap restart, service das restart +

+

+ {{ __('If you need assistance, please contact support.') }} +

+
+
+
+ +
+
+
+

{{ __('EPP Log') }}

+
+
+ 
{{ eppLogs|raw }}
+
+
+
+ +
+
+
+

{{ __('WHOIS Log') }}

+
+
+ 
{{ whoisLogs|raw }}
+
+
+
+ +
+
+
+

{{ __('RDAP Log') }}

+
+
+ 
{{ rdapLogs|raw }}
+
+
+
+ +

{{ __('Backup Log') }}

- 
{{ backupLog|raw }}
+ 
{{ backupLog|raw }}
-
{% include 'partials/footer.twig' %}