Fix auto-refresh ignoring 'Off' setting on page load

Using || 30 / || 60 as a fallback treats refreshInterval=0 (Off) as falsy and replaces it with the default, causing auto-refresh to start even when the user saved 'Off'. Replace with nullish coalescing (??) so only null/undefined triggers the default. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Fix monitor loop double-sleep on error; add grep -F regression test
2026-05-13 13:19:44 -04:00 · 2026-05-13 13:16:43 -04:00
4 changed files with 9 additions and 2 deletions
@@ -970,6 +970,7 @@ class NetworkMonitor:
            except Exception as e:
                logger.error(f'Monitor loop error: {e}', exc_info=True)
                time.sleep(30)
+                continue

            time.sleep(self.poll_interval)

@@ -469,7 +469,7 @@
 {% block scripts %}
 <script>
  // Start auto-refresh using saved settings interval (default 30 s)
-  const _savedInterval = (window.gandalfSettings && window.gandalfSettings.refreshInterval) || 30;
+  const _savedInterval = window.gandalfSettings?.refreshInterval ?? 30;
  if (_savedInterval > 0) lt.autoRefresh.start(refreshAll, _savedInterval * 1000);

  // When settings change, restart auto-refresh with new interval
@@ -571,7 +571,7 @@ async function loadLinks() {
 }

 loadLinks();
-const _linksInterval = (window.gandalfSettings && window.gandalfSettings.refreshInterval) || 60;
+const _linksInterval = window.gandalfSettings?.refreshInterval ?? 60;
 if (_linksInterval > 0) lt.autoRefresh.start(loadLinks, Math.max(_linksInterval, 15) * 1000);

 window.onGandalfSettingsChanged = function(s) {
@@ -36,6 +36,12 @@ class TestBuildSshCommand:
        cmd = DiagnosticsRunner.build_ssh_command('10.0.0.1', 'eth0')
        assert 'ethtool' in cmd

+    def test_dmesg_uses_fixed_string_grep(self):
+        # grep -F prevents iface names with dots (e.g. eth0.1) being treated as
+        # regex wildcards; -- prevents leading - from being parsed as a flag
+        cmd = DiagnosticsRunner.build_ssh_command('10.0.0.1', 'eth0')
+        assert 'grep -F --' in cmd
+

 # ── parse_output ─────────────────────────────────────────────────────────────
Author	SHA1	Message	Date
jared	156ef97667	Fix auto-refresh ignoring 'Off' setting on page load Lint / Python (flake8) (push) Successful in 40s Details Lint / JS (eslint) (push) Successful in 7s Details Security / Python Security (bandit) (push) Successful in 39s Details Test / Python Tests (pytest) (push) Successful in 53s Details Lint / Notify on failure (push) Has been skipped Details Lint / Deploy (push) Successful in 2s Details Using \|\| 30 / \|\| 60 as a fallback treats refreshInterval=0 (Off) as falsy and replaces it with the default, causing auto-refresh to start even when the user saved 'Off'. Replace with nullish coalescing (??) so only null/undefined triggers the default. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 13:19:44 -04:00
jared	2f74266bd9	Fix monitor loop double-sleep on error; add grep -F regression test Lint / Python (flake8) (push) Successful in 49s Details Lint / JS (eslint) (push) Successful in 9s Details Security / Python Security (bandit) (push) Successful in 42s Details Test / Python Tests (pytest) (push) Successful in 51s Details Lint / Notify on failure (push) Has been skipped Details Lint / Deploy (push) Successful in 3s Details On exception the monitor slept 30s inside the except block then fell through to time.sleep(poll_interval), giving a 150s recovery gap instead of 30s. Adding continue after the error sleep fixes this. Also adds a regression test asserting dmesg filtering uses grep -F -- so a future refactor cannot silently reintroduce the regex wildcard bug. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 13:16:43 -04:00