From 835a4519377fedc18a540b83ab75338adae07d47 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Tue, 10 Oct 2023 16:26:31 +0300
Subject: [PATCH] v7.0.0.0

Changelog: https://roxy-wi.org/changelog#7.0.0
---
 app/modules/roxywi/overview.py | 25 ++++++++++++++++---------
 inc/overview.js                |  1 +
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/modules/roxywi/overview.py b/app/modules/roxywi/overview.py
index 9f39fc0a..0fddb504 100644
--- a/app/modules/roxywi/overview.py
+++ b/app/modules/roxywi/overview.py
@@ -1,5 +1,3 @@
-import os
-
 import psutil
 import requests
 from flask import render_template, request
@@ -33,7 +31,7 @@ def show_sub_ovw() -> None:
     return render_template('ajax/show_sub_ovw.html', sub=sql.select_user_all(), lang=lang)
 
 
-def show_overview(serv) -> None:
+def show_overview(serv) -> str:
     servers = []
     user_uuid = request.cookies.get('uuid')
     group_id = request.cookies.get('group')
@@ -62,29 +60,38 @@ def show_overview(serv) -> None:
 
     if haproxy:
         cmd = f'echo "show info" |nc {server[0][2]} {sql.get_setting("haproxy_sock_port")} -w 1|grep -e "Process_num"'
-        haproxy_process = service_common.server_status(server_mod.subprocess_execute(cmd))
+        try:
+            haproxy_process = service_common.server_status(server_mod.subprocess_execute(cmd))
+        except Exception:
+            return f'{e} for server {server[0][2]}'
 
     if nginx:
         nginx_cmd = f'echo "something" |nc {server[0][2]} {sql.get_setting("nginx_stats_port")} -w 1'
-        nginx_process = service_common.server_status(server_mod.subprocess_execute(nginx_cmd))
+        try:
+            nginx_process = service_common.server_status(server_mod.subprocess_execute(nginx_cmd))
+        except Exception:
+            return f'{e} for server {server[0][2]}'
 
     if apache:
         apache_cmd = f'echo "something" |nc {server[0][2]} {sql.get_setting("apache_stats_port")} -w 1'
-        apache_process = service_common.server_status(server_mod.subprocess_execute(apache_cmd))
+        try:
+            apache_process = service_common.server_status(server_mod.subprocess_execute(apache_cmd))
+        except Exception:
+            return f'{e} for server {server[0][2]}'
 
     if keepalived:
         command = ["ps ax |grep keepalived|grep -v grep|wc -l|tr -d '\n'"]
         try:
             keepalived_process = server_mod.ssh_command(server[0][2], command)
         except Exception as e:
-            raise Exception(f'error: {e} for server {server[0][2]}')
+            return f'{e} for server {server[0][2]}'
 
     if waf_len >= 1:
         command = ["ps ax |grep waf/bin/modsecurity |grep -v grep |wc -l"]
         try:
             waf_process = server_mod.ssh_command(server[0][2], command)
         except Exception as e:
-            raise Exception(f'error: {e} for server {server[0][2]}')
+            return f'{e} for server {server[0][2]}'
 
     server_status = (
         server[0][1], server[0][2], haproxy, haproxy_process, waf_process, waf, keepalived, keepalived_process, nginx,
@@ -171,7 +178,7 @@ def show_services_overview():
     metrics_worker = 0
     checker_worker = 0
     servers_group = []
-    host = os.environ.get('HTTP_HOST', '')
+    host = request.host
     user_group = roxywi_common.get_user_group(id=1)
     lang = roxywi_common.get_user_lang_for_flask()
 
diff --git a/inc/overview.js b/inc/overview.js
index 57a2ceff..22c1abe8 100644
--- a/inc/overview.js
+++ b/inc/overview.js
@@ -65,6 +65,7 @@ function showOverviewCallBack(serv, hostnamea) {
 		success: function( data ) {
 			if (data.indexOf('error:') != '-1') {
 				toastr.error(data);
+				$("#"+hostnamea).html("");
 			} else {
 				$("#" + hostnamea).empty();
 				$("#" + hostnamea).html(data);