Store refresh intervals in a common place for easy editing (and possibly future programatic adjustments)

Signed-off-by: DL6ER <dl6er@dl6er.de>

scripts/pi-hole/js/footer.js

@@ -12,6 +12,24 @@
 
 var settingsLevel = 0;
 
+const REFRESH_INTERVAL = {
+  blocking: 10000, // 10 sec
+  system: 20000, // 20 sec
+  sensors: 20000, // 20 sec
+  messages: 60000, // 1 min
+  version: 120000, // 2 min
+  ftl: 120000, // 2 min
+  history: 600000, // 10 min
+  clients: 600000, // 10 min
+  query_types: 60000, // 1 min
+  upstreams: 60000, // 1 min
+  summary: 1000, // 1 sec
+  top_lists: 60000, // 1 min
+  hosts: 120000, // 2 min
+  metrics: 10000, // 10 sec
+  logs: 500, // 0.5 sec
+};
+
 function secondsTimeSpanToHMS(s) {
   var h = Math.floor(s / 3600); //Get whole hours
   s -= h * 3600;
@@ -92,11 +110,11 @@ function checkBlocking() {
   })
     .done(function (data) {
       piholeChanged(data.blocking);
-      setTimeout(checkBlocking, 10000);
+      setTimeout(checkBlocking, REFRESH_INTERVAL.blocking);
     })
     .fail(function (data) {
       apiFailure(data);
-      setTimeout(checkBlocking, 30000);
+      setTimeout(checkBlocking, 3 * REFRESH_INTERVAL.blocking);
     });
 }
 
@@ -241,9 +259,8 @@ function updateFtlInfo() {
         ftl.allow_destructive ? "" : "Destructive actions are disabled by a config setting"
       );
 
-      // Update every 120 seconds
       clearTimeout(ftlinfoTimer);
-      ftlinfoTimer = setTimeout(updateFtlInfo, 120000);
+      ftlinfoTimer = setTimeout(updateFtlInfo, REFRESH_INTERVAL.ftl);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -340,9 +357,9 @@ function updateSystemInfo() {
         moment.duration(1000 * system.uptime).humanize() + " (running since " + startdate + ")"
       );
       $("#sysinfo-system-overlay").hide();
-      // Update every 20 seconds
+
       clearTimeout(systemTimer);
-      systemTimer = setTimeout(updateSystemInfo, 20000);
+      systemTimer = setTimeout(updateSystemInfo, REFRESH_INTERVAL.system);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -395,7 +412,7 @@ function updateSensorsInfo() {
 
       // Update every 20 seconds
       clearTimeout(sensorsTimer);
-      sensorsTimer = setTimeout(updateSensorsInfo, 20000);
+      sensorsTimer = setTimeout(updateSensorsInfo, REFRESH_INTERVAL.sensors);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -564,9 +581,8 @@ function updateVersionInfo() {
         'To install updates, run <code><a href="https://docs.pi-hole.net/main/update/" rel="noopener" target="_blank">pihole -up</a></code>.'
       );
 
-    // Update every 120 seconds
     clearTimeout(versionTimer);
-    versionTimer = setTimeout(updateVersionInfo, 120000);
+    versionTimer = setTimeout(updateVersionInfo, REFRESH_INTERVAL.version);
   });
 }
 
@@ -589,8 +605,8 @@ $(function () {
   if (window.location.pathname !== "/admin/login") {
     // Run check immediately after page loading ...
     utils.checkMessages();
-    // ... and once again with five seconds delay
-    setTimeout(utils.checkMessages, 5000);
+    // ... and then periodically
+    setInterval(utils.checkMessages, REFRESH_INTERVAL.messages);
   }
 });
 

scripts/pi-hole/js/index.js

@@ -5,7 +5,7 @@
  *  This file is copyright under the latest version of the EUPL.
  *  Please see LICENSE file for your rights under this license. */
 
-/* global utils:false, Chart:false, apiFailure:false, THEME_COLORS:false, customTooltips:false, htmlLegendPlugin:false,doughnutTooltip:false, ChartDeferred:false */
+/* global utils:false, Chart:false, apiFailure:false, THEME_COLORS:false, customTooltips:false, htmlLegendPlugin:false,doughnutTooltip:false, ChartDeferred:false, REFRESH_INTERVAL: false */
 
 // Define global variables
 var timeLineChart, clientsChart;
@@ -71,16 +71,14 @@ function updateQueriesOverTime() {
     timeLineChart.update();
   })
     .done(function () {
-      // Reload graph after 10 minutes
       failures = 0;
-      setTimeout(updateQueriesOverTime, 600000);
+      setTimeout(updateQueriesOverTime, REFRESH_INTERVAL.history);
     })
     .fail(function () {
       failures++;
       if (failures < 5) {
-        // Try again after 1 minute only if this has not failed more
-        // than five times in a row
-        setTimeout(updateQueriesOverTime, 60000);
+        // Try again ´only if this has not failed more than five times in a row
+        setTimeout(updateQueriesOverTime, 0.1 * REFRESH_INTERVAL.history);
       }
     })
     .fail(function (data) {
@@ -123,8 +121,7 @@ function updateQueryTypesPie() {
     queryTypePieChart.update("none");
   })
     .done(function () {
-      // Reload graph after minute
-      setTimeout(updateQueryTypesPie, 60000);
+      setTimeout(updateQueryTypesPie, REFRESH_INTERVAL.query_types);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -185,14 +182,13 @@ function updateClientsOverTime() {
     .done(function () {
       // Reload graph after 10 minutes
       failures = 0;
-      setTimeout(updateClientsOverTime, 600000);
+      setTimeout(updateClientsOverTime, REFRESH_INTERVAL.clients);
     })
     .fail(function () {
       failures++;
       if (failures < 5) {
-        // Try again after 1 minute only if this has not failed more
-        // than five times in a row
-        setTimeout(updateClientsOverTime, 60000);
+        // Try again only if this has not failed more than five times in a row
+        setTimeout(updateClientsOverTime, 0.1 * REFRESH_INTERVAL.clients);
       }
     })
     .fail(function (data) {
@@ -253,8 +249,7 @@ function updateForwardDestinationsPie() {
     forwardDestinationPieChart.update("none");
   })
     .done(function () {
-      // Reload graph after one minute
-      setTimeout(updateForwardDestinationsPie, 60000);
+      setTimeout(updateForwardDestinationsPie, REFRESH_INTERVAL.upstreams);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -382,7 +377,7 @@ function updateTopLists() {
   updateTopClientsTable(false);
 
   // Update top lists data every 10 seconds
-  setTimeout(updateTopLists, 10000);
+  setTimeout(updateTopLists, REFRESH_INTERVAL.top_lists);
 }
 
 function glowIfChanged(elem, textData) {
@@ -392,13 +387,7 @@ function glowIfChanged(elem, textData) {
   }
 }
 
-function updateSummaryData(runOnce) {
-  var setTimer = function (timeInSeconds) {
-    if (!runOnce) {
-      setTimeout(updateSummaryData, timeInSeconds * 1000);
-    }
-  };
-
+function updateSummaryData(runOnce = false) {
   $.getJSON("/api/stats/summary", function (data) {
     var intl = new Intl.NumberFormat();
     glowIfChanged($("span#dns_queries"), intl.format(parseInt(data.queries.total, 10)));
@@ -422,10 +411,10 @@ function updateSummaryData(runOnce) {
     }, 500);
   })
     .done(function () {
-      setTimer(1);
+      if (!runOnce) setTimeout(updateSummaryData, REFRESH_INTERVAL.summary);
     })
     .fail(function (data) {
-      setTimer(300);
+      setTimeout(updateSummaryData, 3 * REFRESH_INTERVAL.summary);
       apiFailure(data);
     });
 }

scripts/pi-hole/js/settings-system.js

@@ -5,7 +5,7 @@
  *  This file is copyright under the latest version of the EUPL.
  *  Please see LICENSE file for your rights under this license. */
 
-/* global apiFailure:false, Chart:false, THEME_COLORS:false, customTooltips:false, htmlLegendPlugin:false,doughnutTooltip:false, ChartDeferred:false */
+/* global apiFailure:false, Chart:false, THEME_COLORS:false, customTooltips:false, htmlLegendPlugin:false,doughnutTooltip:false, ChartDeferred:false, REFRESH_INTERVAL: false */
 
 var hostinfoTimer = null;
 var cachePieChart = null;
@@ -105,9 +105,8 @@ function updateHostInfo() {
           " " +
           uname.machine
       );
-      // Update every 120 seconds
       clearTimeout(hostinfoTimer);
-      hostinfoTimer = setTimeout(updateHostInfo, 120000);
+      hostinfoTimer = setTimeout(updateHostInfo, REFRESH_INTERVAL.hosts);
     })
     .fail(function (data) {
       apiFailure(data);
@@ -173,9 +172,8 @@ function updateMetrics() {
       );
 
       $("div[id^='sysinfo-metrics-overlay']").hide();
-      // Update every 10 seconds
       clearTimeout(metricsTimer);
-      metricsTimer = setTimeout(updateMetrics, 10000);
+      metricsTimer = setTimeout(updateMetrics, REFRESH_INTERVAL.metrics);
     })
     .fail(function (data) {
       apiFailure(data);

scripts/pi-hole/js/taillog.js

@@ -5,14 +5,11 @@
  *  This file is copyright under the latest version of the EUPL.
  *  Please see LICENSE file for your rights under this license. */
 
-/* global moment: false, apiFailure: false, utils: false */
+/* global moment: false, apiFailure: false, utils: false, REFRESH_INTERVAL: false */
 
 var nextID = 0;
 var lastPID = -1;
 
-// Check every 0.5s for fresh data
-const interval = 500;
-
 // Maximum number of lines to display
 const maxlines = 5000;
 
@@ -26,7 +23,7 @@ const markUpdates = true;
 function getData() {
   // Only update when spinner is spinning
   if (!$("#feed-icon").hasClass("fa-play")) {
-    window.setTimeout(getData, interval);
+    window.setTimeout(getData, REFRESH_INTERVAL.logs);
     return;
   }
 
@@ -63,7 +60,7 @@ function getData() {
           $("#output").html("<i>*** Log file is empty ***</i>");
         }
 
-        window.setTimeout(getData, interval);
+        window.setTimeout(getData, REFRESH_INTERVAL.logs);
         return;
       }
 
@@ -107,11 +104,11 @@ function getData() {
       // Set filename
       $("#filename").text(data.file);
 
-      window.setTimeout(getData, interval);
+      window.setTimeout(getData, REFRESH_INTERVAL.logs);
     })
     .fail(function (data) {
       apiFailure(data);
-      window.setTimeout(getData, 5 * interval);
+      window.setTimeout(getData, 5 * REFRESH_INTERVAL.logs);
     });
 }