Merge pull request #4246 from JanzenJohn/develop

Remove infinite requests loop
Merge pull request #4247 from miguelangel-nubla/patch-1
2025-05-07 22:42:29 +00:00 · 2024-12-24 08:16:48 +10:00 · 2024-12-24 08:15:55 +10:00 · 2024-12-20 01:03:21 +01:00 · 2024-12-20 00:59:26 +01:00 · 2024-12-19 16:16:03 +01:00
3 changed files with 6 additions and 1 deletions
--- a/backend/templates/dead_host.conf
+++ b/backend/templates/dead_host.conf
@ -22,5 +22,7 @@ server {
  }
 {% endif %}

+  # Custom
+  include /data/nginx/custom/server_dead[.]conf;
 }
 {% endif %}
--- a/docs/src/advanced-config/index.md
+++ b/docs/src/advanced-config/index.md
@ -181,6 +181,7 @@ You can add your custom configuration snippet files at `/data/nginx/custom` as f
 - `/data/nginx/custom/server_stream.conf`: Included at the end of every stream server block
 - `/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream server block
 - `/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream server block
+ - `/data/nginx/custom/server_dead.conf`: Included at the end of every 404 server block

 Every file is optional.

--- a/frontend/js/app/dashboard/main.js
+++ b/frontend/js/app/dashboard/main.js
@ -50,7 +50,8 @@ module.exports = Mn.View.extend({
    onRender: function () {
        let view = this;

-        Api.Reports.getHostStats()
+        if (typeof view.stats.hosts === 'undefined') {
+            Api.Reports.getHostStats()
                .then(response => {
                    if (!view.isDestroyed()) {
                        view.stats.hosts = response;
@ -60,6 +61,7 @@ module.exports = Mn.View.extend({
                .catch(err => {
                    console.log(err);
                });
+        }
    },

    /**
Author	SHA1	Message	Date
jc21	f90d839ebe	Merge pull request #4246 from JanzenJohn/develop Remove infinite requests loop	2024-12-24 08:16:48 +10:00
jc21	be5278f31e	Merge pull request #4247 from miguelangel-nubla/patch-1 Add custom configuration to 404 hosts	2024-12-24 08:15:55 +10:00
Miguel Angel Nubla	3eecf7a38b	Add custom configuration to 404 hosts	2024-12-20 01:03:21 +01:00
Miguel Angel Nubla	7f9240dda7	Add custom configuration to dead_host.conf	2024-12-20 00:59:26 +01:00
John Janzen	f537619ffe	Revert "Change onRender function to always update the dashboard stats" This reverts commit d26e8c1d0c44a5fbeb1264f8fe713bdac0f5e703. This reopens #4204 (which i can't reproduce sadly) The reverted commit is responsible for an infinite loop of requests to /hosts, which makes buttons unresponsive on the main page another way to invalidate the cache needs to be found this infinite requests loop happens on d26e8c1d0c44a5fbeb1264f8fe713bdac0f5e703 and on the docker image `nginxproxymanager/nginx-proxy-manager-dev:pr-4206` the docker image is attaced to the pr #4206 which merges the commit	2024-12-19 16:16:03 +01:00