From e30c1c1a875f41334a576bfb5d6b978237562b97 Mon Sep 17 00:00:00 2001 From: Bowrna Date: Mon, 22 Dec 2025 13:27:50 +0530 Subject: [PATCH 1/3] chore(nginx): Reload failure with more log info for debugging (cherry picked from commit 5524f5673c8433c9c9063194a22119181740ff2b) --- agent/nginx_reload_manager.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/agent/nginx_reload_manager.py b/agent/nginx_reload_manager.py index 0667bc5b..f3ff120b 100644 --- a/agent/nginx_reload_manager.py +++ b/agent/nginx_reload_manager.py @@ -144,6 +144,18 @@ def _reload_nginx(self) -> ReloadStatus: self.last_reload_at = datetime.now() return ReloadStatus.Success + except subprocess.CalledProcessError as e: + error_msg = f"NGINX reload failed (code: {e.returncode})\n" + error_msg += f"Command: {e.cmd}\n" + if e.stdout: + error_msg += f"Stdout: {e.stdout}\n" + if e.stderr: + error_msg += f"Stderr: {e.stderr}" + + self.error = error_msg + self.log(error_msg) + traceback.print_exc() + return ReloadStatus.Failure except Exception as e: self.error = e From 97987cf108303a935c0d8343592cd87ece6da1ea Mon Sep 17 00:00:00 2001 From: Bowrna Date: Tue, 23 Dec 2025 17:25:50 +0530 Subject: [PATCH 2/3] chore(nginx): Reload failure with more log info for debugging (cherry picked from commit 4759ec9cf8ae9ff778fdba4197c27b72a37486b1) --- agent/nginx_reload_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/nginx_reload_manager.py b/agent/nginx_reload_manager.py index f3ff120b..65ff173c 100644 --- a/agent/nginx_reload_manager.py +++ b/agent/nginx_reload_manager.py @@ -153,7 +153,7 @@ def _reload_nginx(self) -> ReloadStatus: error_msg += f"Stderr: {e.stderr}" self.error = error_msg - self.log(error_msg) + self.log(error_msg, print_always=True) traceback.print_exc() return ReloadStatus.Failure except Exception as e: From 1c0216d37d659454ff6e563aa1ae79ee676596cb Mon Sep 17 00:00:00 2001 From: Bowrna Date: Tue, 30 Dec 2025 18:23:28 +0530 Subject: [PATCH 3/3] chore(nginx): Reload failure with more log info for debugging (cherry picked from commit 967fcbcd64c5ef183d0cda0103aefbd3a329d4d5) --- agent/nginx_reload_manager.py | 2 +- agent/pages/deactivated.html | 2 +- agent/pages/exceeded.html | 2 +- agent/pages/suspended.html | 2 +- agent/templates/agent/nginx.conf.jinja2 | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/agent/nginx_reload_manager.py b/agent/nginx_reload_manager.py index 65ff173c..358a126d 100644 --- a/agent/nginx_reload_manager.py +++ b/agent/nginx_reload_manager.py @@ -151,7 +151,7 @@ def _reload_nginx(self) -> ReloadStatus: error_msg += f"Stdout: {e.stdout}\n" if e.stderr: error_msg += f"Stderr: {e.stderr}" - + self.error = error_msg self.log(error_msg, print_always=True) traceback.print_exc() diff --git a/agent/pages/deactivated.html b/agent/pages/deactivated.html index d65f4a3a..aacb9f3f 100644 --- a/agent/pages/deactivated.html +++ b/agent/pages/deactivated.html @@ -117,7 +117,7 @@

diff --git a/agent/pages/exceeded.html b/agent/pages/exceeded.html index 629dfe49..839364c5 100644 --- a/agent/pages/exceeded.html +++ b/agent/pages/exceeded.html @@ -118,7 +118,7 @@

diff --git a/agent/pages/suspended.html b/agent/pages/suspended.html index b9cd1e2a..b3eb8d92 100644 --- a/agent/pages/suspended.html +++ b/agent/pages/suspended.html @@ -116,7 +116,7 @@

diff --git a/agent/templates/agent/nginx.conf.jinja2 b/agent/templates/agent/nginx.conf.jinja2 index b8c9a91e..e2336a69 100644 --- a/agent/templates/agent/nginx.conf.jinja2 +++ b/agent/templates/agent/nginx.conf.jinja2 @@ -102,7 +102,7 @@ server { location /metrics/mariadb { proxy_pass http://127.0.0.1:9104/metrics; } - + location /metrics/mariadb_proxy { proxy_pass http://127.0.0.1:9104/metrics; } @@ -126,7 +126,7 @@ server { location /metrics/blackbox { proxy_pass http://127.0.0.1:9115/blackbox/metrics; } - + location /metrics/grafana { proxy_pass http://127.0.0.1:3000/grafana/metrics; } @@ -209,7 +209,7 @@ server { auth_basic_user_file /home/frappe/agent/nginx/grafana.htpasswd; proxy_pass http://127.0.0.1:9115/blackbox; } - + location /grafana { auth_basic "Grafana UI"; auth_basic_user_file /home/frappe/agent/nginx/grafana-ui.htpasswd; @@ -240,7 +240,7 @@ server { location /kibana/ { auth_basic "Kibana"; auth_basic_user_file /home/frappe/agent/nginx/kibana.htpasswd; - + proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header host $host;