From ab81c136cce255f1918b712256144605e2af6eb6 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 18 Sep 2026 21:37:05 +0100
Subject: [PATCH 1/7] Release 2.1.1

---
 core/constants.py         |  2 +-
 pyproject.toml            |  2 +-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/constants.py b/core/constants.py
index ea76e43..7f427cf 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -4,7 +4,7 @@ from data.band import Band
 from data.sig import SIG
 
 # General software
-SOFTWARE_VERSION = "2.1"
+SOFTWARE_VERSION = "2.1.1"
 
 # HTTP headers used for spot providers that use HTTP
 HTTP_HEADERS = {"User-Agent": f"Spothole v{SOFTWARE_VERSION} (operated by {SERVER_OWNER_CALLSIGN})"}
diff --git a/pyproject.toml b/pyproject.toml
index b399009..880285a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "spothole"
-version = "2.1"
+version = "2.1.1"
 authors = [
     { name = "Ian Renton", email = "ian@ianrenton.com" },
 ]
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 5eb2e5a..1ac1058 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789763607"></script>
+<script src="/static/js/add-spot.js?v=1789763826"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 8af212b..fed4253 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789763607"></script>
+<script src="/static/js/alerts.js?v=1789763826"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 9266406..fd234cc 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763607"></script>
-<script src="/static/js/bands.js?v=1789763607"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789763826"></script>
+<script src="/static/js/bands.js?v=1789763826"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 0061012..456bb53 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789763607" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789763825" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789763607"></script>
-<script src="/static/js/ui-ham.js?v=1789763607"></script>
-<script src="/static/js/geo.js?v=1789763607"></script>
-<script src="/static/js/common.js?v=1789763607"></script>
+<script src="/static/js/utils.js?v=1789763825"></script>
+<script src="/static/js/ui-ham.js?v=1789763825"></script>
+<script src="/static/js/geo.js?v=1789763825"></script>
+<script src="/static/js/common.js?v=1789763825"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 14c0a87..550704d 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789763607"></script>
+<script src="/static/js/conditions.js?v=1789763825"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index bb5d920..622dd7b 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763606"></script>
-<script src="/static/js/map.js?v=1789763606"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789763825"></script>
+<script src="/static/js/map.js?v=1789763825"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 2069376..b0f6620 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763606"></script>
-<script src="/static/js/spots.js?v=1789763606"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789763825"></script>
+<script src="/static/js/spots.js?v=1789763825"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 07788c2..a3b190e 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789763607"></script>
+<script src="/static/js/status.js?v=1789763826"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 59d5f61d9001085df5b74cabb6cfc09efdbdf4be Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 19 Sep 2026 07:55:12 +0100
Subject: [PATCH 2/7] Potential fix for an issue where the telnet client was
 reconnecting right at the same time we try to shut down spothole, causing the
 stop() method to close one telnet object but then a new one is created and
 read from anyway.

---
 providers/spot/dxcluster.py | 17 +++++++++++++----
 providers/spot/rbn.py       | 17 +++++++++++++----
 templates/add_spot.html     |  2 +-
 templates/alerts.html       |  2 +-
 templates/bands.html        |  4 ++--
 templates/base.html         | 10 +++++-----
 templates/conditions.html   |  2 +-
 templates/map.html          |  4 ++--
 templates/spots.html        |  4 ++--
 templates/status.html       |  2 +-
 10 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/providers/spot/dxcluster.py b/providers/spot/dxcluster.py
index eb537df..7ff26bb 100644
--- a/providers/spot/dxcluster.py
+++ b/providers/spot/dxcluster.py
@@ -1,7 +1,7 @@
 import logging
 import re
 from datetime import datetime
-from threading import Event, Thread
+from threading import Event, Lock, Thread
 
 import pytz
 import telnetlib3
@@ -40,6 +40,7 @@ class DXCluster(SpotProvider):
             self._LINE_PATTERN_ALLOW_RBN if self._allow_rbn_spots else self._LINE_PATTERN_EXCLUDE_RBN
         )
         self._telnet = None
+        self._telnet_lock = Lock()
         self._thread = None
         self._stop_event = Event()
 
@@ -49,8 +50,9 @@ class DXCluster(SpotProvider):
 
     def stop(self):
         self._stop_event.set()
-        if self._telnet:
-            self._telnet.close()
+        with self._telnet_lock:
+            if self._telnet:
+                self._telnet.close()
         if self._thread:
             self._thread.join(timeout=15)
             if self._thread.is_alive():
@@ -63,7 +65,14 @@ class DXCluster(SpotProvider):
                 try:
                     self.status = "Connecting"
                     logger.info(f"DX Cluster {self._hostname} connecting...")
-                    self._telnet = telnetlib3.Telnet(self._hostname, self._port)
+                    new_telnet = telnetlib3.Telnet(self._hostname, self._port)
+                    with self._telnet_lock:
+                        self._telnet = new_telnet
+                        if self._stop_event.is_set():
+                            # stop() was called while we were connecting, close the connection rather than trying to
+                            # read when we know it won't work
+                            new_telnet.close()
+                            break
                     self._telnet.read_until(self._login_prompt.encode("latin-1"))
                     self._telnet.write(f"{self._login_callsign}\n".encode("latin-1"))
                     connected = True
diff --git a/providers/spot/rbn.py b/providers/spot/rbn.py
index 7923b9e..28b3261 100644
--- a/providers/spot/rbn.py
+++ b/providers/spot/rbn.py
@@ -1,7 +1,7 @@
 import logging
 import re
 from datetime import datetime
-from threading import Event, Thread
+from threading import Event, Lock, Thread
 
 import pytz
 import telnetlib3
@@ -29,6 +29,7 @@ class RBN(SpotProvider):
         super().__init__(name, provider_config)
         self._port = provider_config["port"]
         self._telnet = None
+        self._telnet_lock = Lock()
         self._thread = None
         self._stop_event = Event()
 
@@ -38,8 +39,9 @@ class RBN(SpotProvider):
 
     def stop(self):
         self._stop_event.set()
-        if self._telnet:
-            self._telnet.close()
+        with self._telnet_lock:
+            if self._telnet:
+                self._telnet.close()
         if self._thread:
             self._thread.join(timeout=15)
             if self._thread.is_alive():
@@ -52,7 +54,14 @@ class RBN(SpotProvider):
                 try:
                     self.status = "Connecting"
                     logger.info(f"RBN port {self._port!s} connecting...")
-                    self._telnet = telnetlib3.Telnet("telnet.reversebeacon.net", self._port)
+                    new_telnet = telnetlib3.Telnet("telnet.reversebeacon.net", self._port)
+                    with self._telnet_lock:
+                        self._telnet = new_telnet
+                        if self._stop_event.is_set():
+                            # stop() was called while we were connecting, close the connection rather than trying to
+                            # read when we know it won't work
+                            new_telnet.close()
+                            break
                     self._telnet.read_until("Please enter your call: ".encode("latin-1"))
                     self._telnet.write(f"{SERVER_OWNER_CALLSIGN}\n".encode("latin-1"))
                     connected = True
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 1ac1058..b629870 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789763826"></script>
+<script src="/static/js/add-spot.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index fed4253..a3b58e0 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789763826"></script>
+<script src="/static/js/alerts.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index fd234cc..dc7a4df 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763826"></script>
-<script src="/static/js/bands.js?v=1789763826"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
+<script src="/static/js/bands.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 456bb53..75a8643 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789763825" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789800912" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789763825"></script>
-<script src="/static/js/ui-ham.js?v=1789763825"></script>
-<script src="/static/js/geo.js?v=1789763825"></script>
-<script src="/static/js/common.js?v=1789763825"></script>
+<script src="/static/js/utils.js?v=1789800912"></script>
+<script src="/static/js/ui-ham.js?v=1789800912"></script>
+<script src="/static/js/geo.js?v=1789800912"></script>
+<script src="/static/js/common.js?v=1789800912"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 550704d..7f5c5c4 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789763825"></script>
+<script src="/static/js/conditions.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 622dd7b..286f01c 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763825"></script>
-<script src="/static/js/map.js?v=1789763825"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
+<script src="/static/js/map.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index b0f6620..aff599b 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789763825"></script>
-<script src="/static/js/spots.js?v=1789763825"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
+<script src="/static/js/spots.js?v=1789800912"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index a3b190e..0513b7b 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789763826"></script>
+<script src="/static/js/status.js?v=1789800912"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From c9c8ffc1f7e1cd1488543a0c90047301f7377b8d Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 19 Sep 2026 08:04:50 +0100
Subject: [PATCH 3/7] If cache load fails because objects are from a different
 version and throw an exception, clear the cache.

---
 core/live_data_cache.py          |  7 ++++++-
 core/single_object_data_cache.py |  8 +++++++-
 templates/add_spot.html          |  2 +-
 templates/alerts.html            |  2 +-
 templates/bands.html             |  4 ++--
 templates/base.html              | 10 +++++-----
 templates/conditions.html        |  2 +-
 templates/map.html               |  4 ++--
 templates/spots.html             |  4 ++--
 templates/status.html            |  2 +-
 10 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/core/live_data_cache.py b/core/live_data_cache.py
index 6fb61e4..34e35d8 100644
--- a/core/live_data_cache.py
+++ b/core/live_data_cache.py
@@ -77,7 +77,12 @@ class LiveDataCache:
             logger.exception(f"Failed to write snapshot to {self._snapshot_dir}")
 
     def _load_snapshot(self):
-        data = self._disk_cache.get("snapshot")
+        try:
+            data = self._disk_cache.get("snapshot")
+        except Exception:
+            logger.warning(f"Failed to load snapshot from {self._snapshot_dir}, clearing it.")
+            self._disk_cache.clear()
+            return
         if not data:
             return
 
diff --git a/core/single_object_data_cache.py b/core/single_object_data_cache.py
index 66b1d7f..f4d164a 100644
--- a/core/single_object_data_cache.py
+++ b/core/single_object_data_cache.py
@@ -21,7 +21,13 @@ class SingleObjectDataCache:
         # This cache stores a single object, doesn't matter what it's called so "object" will do
         if "object" not in self._cache:
             self._cache.add("object", object_if_empty)
-        self._obj = self._cache.get("object")
+        try:
+            self._obj = self._cache.get("object")
+        except Exception:
+            logger.warning(f"Failed to load cache from {cache_dir}, clearing it.")
+            self._cache.clear()
+            self._cache.add("object", object_if_empty)
+            self._obj = object_if_empty
 
     def get(self):
         """Get the data object. This can then be manipulated as necessary across multiple threads. Any function
diff --git a/templates/add_spot.html b/templates/add_spot.html
index b629870..3d9632a 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789800912"></script>
+<script src="/static/js/add-spot.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index a3b58e0..db16f4b 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789800912"></script>
+<script src="/static/js/alerts.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index dc7a4df..4c6b19d 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
-<script src="/static/js/bands.js?v=1789800912"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
+<script src="/static/js/bands.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 75a8643..27c8fae 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789800912" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789801490" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789800912"></script>
-<script src="/static/js/ui-ham.js?v=1789800912"></script>
-<script src="/static/js/geo.js?v=1789800912"></script>
-<script src="/static/js/common.js?v=1789800912"></script>
+<script src="/static/js/utils.js?v=1789801490"></script>
+<script src="/static/js/ui-ham.js?v=1789801490"></script>
+<script src="/static/js/geo.js?v=1789801490"></script>
+<script src="/static/js/common.js?v=1789801490"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 7f5c5c4..6722749 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789800912"></script>
+<script src="/static/js/conditions.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 286f01c..d956aa2 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
-<script src="/static/js/map.js?v=1789800912"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
+<script src="/static/js/map.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index aff599b..01cf1f3 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789800912"></script>
-<script src="/static/js/spots.js?v=1789800912"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
+<script src="/static/js/spots.js?v=1789801490"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 0513b7b..cff0984 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789800912"></script>
+<script src="/static/js/status.js?v=1789801490"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From f39215ecdddf9ff0b52703d6e8c7b29a3c31768d Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 19 Sep 2026 08:33:15 +0100
Subject: [PATCH 4/7] Attempt at fixing slight hscroll on mobile

---
 core/constants.py         |  2 +-
 pyproject.toml            |  2 +-
 static/css/style.css      |  4 ++--
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/constants.py b/core/constants.py
index 7f427cf..ca27979 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -4,7 +4,7 @@ from data.band import Band
 from data.sig import SIG
 
 # General software
-SOFTWARE_VERSION = "2.1.1"
+SOFTWARE_VERSION = "2.1.2"
 
 # HTTP headers used for spot providers that use HTTP
 HTTP_HEADERS = {"User-Agent": f"Spothole v{SOFTWARE_VERSION} (operated by {SERVER_OWNER_CALLSIGN})"}
diff --git a/pyproject.toml b/pyproject.toml
index 880285a..00d0938 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "spothole"
-version = "2.1.1"
+version = "2.1.2"
 authors = [
     { name = "Ian Renton", email = "ian@ianrenton.com" },
 ]
diff --git a/static/css/style.css b/static/css/style.css
index d3fdc97..e7b94ee 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -414,8 +414,8 @@ div.band-spot:hover span.band-spot-info {
 
     /* Make map stretch to horizontal screen edges */
     div#map, div#table-container, div#bands-container {
-        margin-left: -1em;
-        margin-right: -1em;
+        margin-left: -0.75rem;
+        margin-right: -0.75rem;
     }
 
     /* Avoid map page filters panel being larger than the map itself */
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 3d9632a..04db25c 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789801490"></script>
+<script src="/static/js/add-spot.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index db16f4b..fd75c6f 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789801490"></script>
+<script src="/static/js/alerts.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 4c6b19d..e3874c3 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/bands.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789803195"></script>
+<script src="/static/js/bands.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 27c8fae..1ed9531 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789801490" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789803195" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789801490"></script>
-<script src="/static/js/ui-ham.js?v=1789801490"></script>
-<script src="/static/js/geo.js?v=1789801490"></script>
-<script src="/static/js/common.js?v=1789801490"></script>
+<script src="/static/js/utils.js?v=1789803195"></script>
+<script src="/static/js/ui-ham.js?v=1789803195"></script>
+<script src="/static/js/geo.js?v=1789803195"></script>
+<script src="/static/js/common.js?v=1789803195"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 6722749..af63e4c 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789801490"></script>
+<script src="/static/js/conditions.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index d956aa2..2ee7732 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/map.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789803195"></script>
+<script src="/static/js/map.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 01cf1f3..9d54019 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/spots.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789803195"></script>
+<script src="/static/js/spots.js?v=1789803195"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index cff0984..6403690 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789801490"></script>
+<script src="/static/js/status.js?v=1789803195"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From 682e2c267c05fc8aa2f3369e0293008064e68f04 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 19 Sep 2026 10:49:09 +0100
Subject: [PATCH 5/7] Improve handling of empty JSON repsonses from ParksNPeaks
 (and potentially others)

---
 providers/alert/http_alert_provider.py |  7 ++++++-
 providers/spot/http_spot_provider.py   |  7 ++++++-
 templates/add_spot.html                |  2 +-
 templates/alerts.html                  |  2 +-
 templates/bands.html                   |  4 ++--
 templates/base.html                    | 10 +++++-----
 templates/conditions.html              |  2 +-
 templates/map.html                     |  4 ++--
 templates/spots.html                   |  4 ++--
 templates/status.html                  |  2 +-
 10 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/providers/alert/http_alert_provider.py b/providers/alert/http_alert_provider.py
index 83d1c6b..a06dd45 100644
--- a/providers/alert/http_alert_provider.py
+++ b/providers/alert/http_alert_provider.py
@@ -4,7 +4,7 @@ from threading import Event, Thread
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, JSONDecodeError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from providers.alert.alert_provider import AlertProvider
@@ -64,9 +64,14 @@ class HTTPAlertProvider(AlertProvider):
                 logger.warning(f"HTTP {http_response.status_code} when calling {self.name} alerts API.")
 
         except ConnectionError:
+            self.status = "Error"
             logger.warning(f"Connection error when accessing {self.name} alerts API.")
         except (ConnectTimeout, ReadTimeout):
+            self.status = "Error"
             logger.warning(f"Timeout when accessing {self.name} alerts API.")
+        except JSONDecodeError:
+            self.status = "Error"
+            logger.warning(f"Invalid or empty JSON response from {self.name} alert API.")
         except Exception:
             self.status = "Error"
             logger.exception(f"Exception in HTTP JSON Alert Provider ({self.name})")
diff --git a/providers/spot/http_spot_provider.py b/providers/spot/http_spot_provider.py
index 124742a..f71f81f 100644
--- a/providers/spot/http_spot_provider.py
+++ b/providers/spot/http_spot_provider.py
@@ -4,7 +4,7 @@ from threading import Event, Thread
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, JSONDecodeError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from providers.spot.spot_provider import SpotProvider
@@ -73,9 +73,14 @@ class HTTPSpotProvider(SpotProvider):
                 logger.warning(f"HTTP {http_response.status_code} when calling {self.name} spot API.")
 
         except ConnectionError:
+            self.status = "Error"
             logger.warning(f"Connection error when accessing {self.name} spots API.")
         except (ConnectTimeout, ReadTimeout):
+            self.status = "Error"
             logger.warning(f"Timeout when accessing {self.name} spots API.")
+        except JSONDecodeError:
+            self.status = "Error"
+            logger.warning(f"Invalid or empty JSON response from {self.name} spots API.")
         except Exception:
             self.status = "Error"
             logger.exception(f"Exception in HTTP Spot Provider ({self.name})")
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 3d9632a..30ad8af 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789801490"></script>
+<script src="/static/js/add-spot.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index db16f4b..4b1bc81 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789801490"></script>
+<script src="/static/js/alerts.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 4c6b19d..133b326 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/bands.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789811349"></script>
+<script src="/static/js/bands.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 27c8fae..95a43e6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789801490" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789811349" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789801490"></script>
-<script src="/static/js/ui-ham.js?v=1789801490"></script>
-<script src="/static/js/geo.js?v=1789801490"></script>
-<script src="/static/js/common.js?v=1789801490"></script>
+<script src="/static/js/utils.js?v=1789811349"></script>
+<script src="/static/js/ui-ham.js?v=1789811349"></script>
+<script src="/static/js/geo.js?v=1789811349"></script>
+<script src="/static/js/common.js?v=1789811349"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 6722749..7cfe8ea 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789801490"></script>
+<script src="/static/js/conditions.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index d956aa2..49dbd39 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/map.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789811349"></script>
+<script src="/static/js/map.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 01cf1f3..634f0d0 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789801490"></script>
-<script src="/static/js/spots.js?v=1789801490"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789811349"></script>
+<script src="/static/js/spots.js?v=1789811349"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index cff0984..1afa8d5 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789801490"></script>
+<script src="/static/js/status.js?v=1789811349"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From f45b7d51b0511723c908198123154d26c5bee2a0 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 19 Sep 2026 15:07:31 +0100
Subject: [PATCH 6/7] Give threads less time to shut down gracefully. Attempt
 shutdown() rather than stop() on the telnet connections to see if that
 improves things

---
 core/cleanup.py                                        |  2 +-
 core/data_providers.py                                 |  2 +-
 providers/alert/http_alert_provider.py                 |  2 +-
 .../file_download_callsign_data_provider.py            |  2 +-
 .../sigrefdata/file_download_sig_ref_data_provider.py  |  2 +-
 providers/solarconditions/giroionosonde.py             |  2 +-
 .../solarconditions/http_solar_conditions_provider.py  |  2 +-
 providers/solarconditions/kc2gprop.py                  |  2 +-
 providers/spot/aprsis.py                               |  2 +-
 providers/spot/dxcluster.py                            |  7 ++++++-
 providers/spot/http_spot_provider.py                   |  2 +-
 providers/spot/rbn.py                                  |  7 ++++++-
 providers/spot/sse_spot_provider.py                    |  2 +-
 providers/spot/websocket_spot_provider.py              |  2 +-
 .../staticdata/file_download_static_data_provider.py   |  2 +-
 templates/add_spot.html                                |  2 +-
 templates/alerts.html                                  |  2 +-
 templates/bands.html                                   |  4 ++--
 templates/base.html                                    | 10 +++++-----
 templates/conditions.html                              |  2 +-
 templates/map.html                                     |  4 ++--
 templates/spots.html                                   |  4 ++--
 templates/status.html                                  |  2 +-
 23 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/core/cleanup.py b/core/cleanup.py
index 3a82fa8..6610d5d 100644
--- a/core/cleanup.py
+++ b/core/cleanup.py
@@ -35,7 +35,7 @@ class CleanupTimer:
 
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning("Cleanup worker thread did not exit on time and will be killed.")
 
diff --git a/core/data_providers.py b/core/data_providers.py
index 06423ee..289b1b7 100644
--- a/core/data_providers.py
+++ b/core/data_providers.py
@@ -91,7 +91,7 @@ class DataProviders:
         for t in threads:
             t.start()
 
-        deadline = time.monotonic() + 40
+        deadline = time.monotonic() + 15
         for t in threads:
             t.join(timeout=max(0.0, deadline - time.monotonic()))
         still_running = [t for t in threads if t.is_alive()]
diff --git a/providers/alert/http_alert_provider.py b/providers/alert/http_alert_provider.py
index a06dd45..eee3b52 100644
--- a/providers/alert/http_alert_provider.py
+++ b/providers/alert/http_alert_provider.py
@@ -33,7 +33,7 @@ class HTTPAlertProvider(AlertProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} alert worker thread did not exit on time and will be killed.")
 
diff --git a/providers/callsigndata/file_download_callsign_data_provider.py b/providers/callsigndata/file_download_callsign_data_provider.py
index 0663ea9..6016ce2 100644
--- a/providers/callsigndata/file_download_callsign_data_provider.py
+++ b/providers/callsigndata/file_download_callsign_data_provider.py
@@ -38,7 +38,7 @@ class FileDownloadCallsignDataProvider(CallsignDataProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} callsign data worker thread did not exit on time and will be killed.")
 
diff --git a/providers/sigrefdata/file_download_sig_ref_data_provider.py b/providers/sigrefdata/file_download_sig_ref_data_provider.py
index d1e243b..48677f4 100644
--- a/providers/sigrefdata/file_download_sig_ref_data_provider.py
+++ b/providers/sigrefdata/file_download_sig_ref_data_provider.py
@@ -33,7 +33,7 @@ class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
     def stop(self):
         super().stop()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.sig_name} SIG ref data worker thread did not exit on time and will be killed.")
 
diff --git a/providers/solarconditions/giroionosonde.py b/providers/solarconditions/giroionosonde.py
index 4067920..1c08618 100644
--- a/providers/solarconditions/giroionosonde.py
+++ b/providers/solarconditions/giroionosonde.py
@@ -73,7 +73,7 @@ class GIROIonosonde(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning("GIRO ionosonde worker thread did not exit on time and will be killed.")
 
diff --git a/providers/solarconditions/http_solar_conditions_provider.py b/providers/solarconditions/http_solar_conditions_provider.py
index a5feeb9..f889fc1 100644
--- a/providers/solarconditions/http_solar_conditions_provider.py
+++ b/providers/solarconditions/http_solar_conditions_provider.py
@@ -31,7 +31,7 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} solar conditions worker thread did not exit on time and will be killed.")
 
diff --git a/providers/solarconditions/kc2gprop.py b/providers/solarconditions/kc2gprop.py
index 8f9cd81..a678bbe 100644
--- a/providers/solarconditions/kc2gprop.py
+++ b/providers/solarconditions/kc2gprop.py
@@ -38,7 +38,7 @@ class KC2GProp(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning("KC2G ionosonde worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/aprsis.py b/providers/spot/aprsis.py
index cc4be2a..8be74b7 100644
--- a/providers/spot/aprsis.py
+++ b/providers/spot/aprsis.py
@@ -49,7 +49,7 @@ class APRSIS(SpotProvider):
         if self._aprsis:
             self._aprsis.close()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning("APRS-IS worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/dxcluster.py b/providers/spot/dxcluster.py
index 7ff26bb..9a4d17f 100644
--- a/providers/spot/dxcluster.py
+++ b/providers/spot/dxcluster.py
@@ -1,5 +1,6 @@
 import logging
 import re
+import socket
 from datetime import datetime
 from threading import Event, Lock, Thread
 
@@ -52,9 +53,13 @@ class DXCluster(SpotProvider):
         self._stop_event.set()
         with self._telnet_lock:
             if self._telnet:
+                try:
+                    self._telnet.sock.shutdown(socket.SHUT_RDWR)
+                except (AttributeError, OSError):
+                    pass
                 self._telnet.close()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning(f"DX Cluster {self._hostname} worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/http_spot_provider.py b/providers/spot/http_spot_provider.py
index f71f81f..88f7dde 100644
--- a/providers/spot/http_spot_provider.py
+++ b/providers/spot/http_spot_provider.py
@@ -35,7 +35,7 @@ class HTTPSpotProvider(SpotProvider):
         self._stop_event.set()
         self._wakeup_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} spot worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/rbn.py b/providers/spot/rbn.py
index 28b3261..580652c 100644
--- a/providers/spot/rbn.py
+++ b/providers/spot/rbn.py
@@ -1,5 +1,6 @@
 import logging
 import re
+import socket
 from datetime import datetime
 from threading import Event, Lock, Thread
 
@@ -41,9 +42,13 @@ class RBN(SpotProvider):
         self._stop_event.set()
         with self._telnet_lock:
             if self._telnet:
+                try:
+                    self._telnet.sock.shutdown(socket.SHUT_RDWR)
+                except (AttributeError, OSError):
+                    pass
                 self._telnet.close()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning(f"RBN (port {self._port!s}) worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/sse_spot_provider.py b/providers/spot/sse_spot_provider.py
index 1b3f93b..a83f9a3 100644
--- a/providers/spot/sse_spot_provider.py
+++ b/providers/spot/sse_spot_provider.py
@@ -42,7 +42,7 @@ class SSESpotProvider(SpotProvider):
                 logger.exception(f"Exception closing SSE connection for {self.name} during stop()")
 
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} SSE worker thread did not exit on time and will be killed.")
 
diff --git a/providers/spot/websocket_spot_provider.py b/providers/spot/websocket_spot_provider.py
index 5c5af61..528d3e7 100644
--- a/providers/spot/websocket_spot_provider.py
+++ b/providers/spot/websocket_spot_provider.py
@@ -34,7 +34,7 @@ class WebsocketSpotProvider(SpotProvider):
         if self._ws:
             self._ws.close()
         if self._thread:
-            self._thread.join(timeout=15)
+            self._thread.join(timeout=5)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} websocket worker thread did not exit on time and will be killed.")
 
diff --git a/providers/staticdata/file_download_static_data_provider.py b/providers/staticdata/file_download_static_data_provider.py
index 6b733f6..4b31b3d 100644
--- a/providers/staticdata/file_download_static_data_provider.py
+++ b/providers/staticdata/file_download_static_data_provider.py
@@ -35,7 +35,7 @@ class FileDownloadStaticDataProvider(StaticDataProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} static data worker thread did not exit on time and will be killed.")
 
diff --git a/templates/add_spot.html b/templates/add_spot.html
index c233fd3..3d29a6e 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789811377"></script>
+<script src="/static/js/add-spot.js?v=1789826851"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index de10240..e1a3a6a 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789811377"></script>
+<script src="/static/js/alerts.js?v=1789826852"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 43d706e..2db0f03 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789811377"></script>
-<script src="/static/js/bands.js?v=1789811377"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789826851"></script>
+<script src="/static/js/bands.js?v=1789826851"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index f04449b..8a8db97 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789811377" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789826851" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789811377"></script>
-<script src="/static/js/ui-ham.js?v=1789811377"></script>
-<script src="/static/js/geo.js?v=1789811377"></script>
-<script src="/static/js/common.js?v=1789811377"></script>
+<script src="/static/js/utils.js?v=1789826851"></script>
+<script src="/static/js/ui-ham.js?v=1789826851"></script>
+<script src="/static/js/geo.js?v=1789826851"></script>
+<script src="/static/js/common.js?v=1789826851"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 7253f75..288d27d 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789811377"></script>
+<script src="/static/js/conditions.js?v=1789826851"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 49287ac..e3130ba 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789811377"></script>
-<script src="/static/js/map.js?v=1789811377"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789826852"></script>
+<script src="/static/js/map.js?v=1789826852"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index b4e8110..e268d64 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789811377"></script>
-<script src="/static/js/spots.js?v=1789811377"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789826851"></script>
+<script src="/static/js/spots.js?v=1789826851"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index aeb8d7e..42e60b7 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789811377"></script>
+<script src="/static/js/status.js?v=1789826851"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");

From ed172a006387cf8c3026db1134d2eb1fb8c35abb Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sun, 20 Sep 2026 09:48:10 +0100
Subject: [PATCH 7/7] Release 2.1.3

---
 core/constants.py         |  2 +-
 pyproject.toml            |  2 +-
 templates/add_spot.html   |  2 +-
 templates/alerts.html     |  2 +-
 templates/bands.html      |  4 ++--
 templates/base.html       | 10 +++++-----
 templates/conditions.html |  2 +-
 templates/map.html        |  4 ++--
 templates/spots.html      |  4 ++--
 templates/status.html     |  2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/constants.py b/core/constants.py
index ca27979..47736f5 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -4,7 +4,7 @@ from data.band import Band
 from data.sig import SIG
 
 # General software
-SOFTWARE_VERSION = "2.1.2"
+SOFTWARE_VERSION = "2.1.3"
 
 # HTTP headers used for spot providers that use HTTP
 HTTP_HEADERS = {"User-Agent": f"Spothole v{SOFTWARE_VERSION} (operated by {SERVER_OWNER_CALLSIGN})"}
diff --git a/pyproject.toml b/pyproject.toml
index 00d0938..9f2222e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "spothole"
-version = "2.1.2"
+version = "2.1.3"
 authors = [
     { name = "Ian Renton", email = "ian@ianrenton.com" },
 ]
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 3d29a6e..ba26079 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789826851"></script>
+<script src="/static/js/add-spot.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index e1a3a6a..238e645 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789826852"></script>
+<script src="/static/js/alerts.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 2db0f03..4bc819e 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789826851"></script>
-<script src="/static/js/bands.js?v=1789826851"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789894090"></script>
+<script src="/static/js/bands.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 8a8db97..099c30d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1789826851" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789894090" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
     window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1789826851"></script>
-<script src="/static/js/ui-ham.js?v=1789826851"></script>
-<script src="/static/js/geo.js?v=1789826851"></script>
-<script src="/static/js/common.js?v=1789826851"></script>
+<script src="/static/js/utils.js?v=1789894090"></script>
+<script src="/static/js/ui-ham.js?v=1789894090"></script>
+<script src="/static/js/geo.js?v=1789894090"></script>
+<script src="/static/js/common.js?v=1789894090"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 288d27d..61ae73b 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1789826851"></script>
+<script src="/static/js/conditions.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index e3130ba..c826c0e 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -113,8 +113,8 @@
     const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
 </script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789826852"></script>
-<script src="/static/js/map.js?v=1789826852"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789894090"></script>
+<script src="/static/js/map.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index e268d64..ecfce2d 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789826851"></script>
-<script src="/static/js/spots.js?v=1789826851"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789894090"></script>
+<script src="/static/js/spots.js?v=1789894090"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 42e60b7..f1792c7 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789826851"></script>
+<script src="/static/js/status.js?v=1789894090"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");