From 4b51dd9ba5b5b0a04dc28775ac6868d08c2a098e Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Fri, 18 Sep 2026 18:57:18 +0100
Subject: [PATCH] (Hopefully) fix a bug where several sig ref data providers
 try to write to the data store simultaneously on startup.

---
 providers/sigrefdata/sig_ref_data_provider.py |  6 ++++--
 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 +-
 9 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/providers/sigrefdata/sig_ref_data_provider.py b/providers/sigrefdata/sig_ref_data_provider.py
index bf128a9..a718bf5 100644
--- a/providers/sigrefdata/sig_ref_data_provider.py
+++ b/providers/sigrefdata/sig_ref_data_provider.py
@@ -36,8 +36,10 @@ class SIGRefDataProvider:
     def _add_data(self, new_data):
         """Add all the provided reference data objects to the data store."""
 
-        # with transact() batches all writes together to save making thousands of individual sqlite writes
-        with DATA_STORE.sigrefs.transact():
+        # with transact() batches all writes together to save making thousands of individual sqlite writes. However,
+        # that means that each provider holds the lock while it writes, and the default behaviour for other attempted
+        # transact()s is to fail if they can't get the lock (?!). This behaviour is fixed by retry=True.
+        with DATA_STORE.sigrefs.transact(retry=True):
             for d in new_data:
                 DATA_STORE.sigrefs.set(f"{self.sig_name}:{d.id}", d)
 
diff --git a/templates/add_spot.html b/templates/add_spot.html
index f17337d..0a182db 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -77,7 +77,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1789731849"></script>
+<script src="/static/js/add-spot.js?v=1789754238"></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 3991040..b6dc4d8 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -83,7 +83,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1789731849"></script>
+<script src="/static/js/alerts.js?v=1789754238"></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 5a68601..cf1ab35 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -76,8 +76,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789731849"></script>
-<script src="/static/js/bands.js?v=1789731849"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
+<script src="/static/js/bands.js?v=1789754238"></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 184e8e6..61b7f49 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=1789731849" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1789754238" 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=1789731849"></script>
-<script src="/static/js/ui-ham.js?v=1789731849"></script>
-<script src="/static/js/geo.js?v=1789731849"></script>
-<script src="/static/js/common.js?v=1789731849"></script>
+<script src="/static/js/utils.js?v=1789754238"></script>
+<script src="/static/js/ui-ham.js?v=1789754238"></script>
+<script src="/static/js/geo.js?v=1789754238"></script>
+<script src="/static/js/common.js?v=1789754238"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index f91d21d..e19356e 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=1789731849"></script>
+<script src="/static/js/conditions.js?v=1789754238"></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 90d8e5e..494222b 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=1789731849"></script>
-<script src="/static/js/map.js?v=1789731849"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
+<script src="/static/js/map.js?v=1789754238"></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 111cd3e..4c781e7 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -125,8 +125,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1789731849"></script>
-<script src="/static/js/spots.js?v=1789731849"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
+<script src="/static/js/spots.js?v=1789754238"></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 3e516d0..5f0d879 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1789731849"></script>
+<script src="/static/js/status.js?v=1789754238"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");