diff --git a/agent/nginx_reload_manager.py b/agent/nginx_reload_manager.py index 0667bc5b..358a126d 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, print_always=True) + traceback.print_exc() + return ReloadStatus.Failure except Exception as e: self.error = e 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;