Error handling improvements

This commit is contained in:
Ian Renton
2026-08-16 09:26:05 +01:00
parent 0291be3338
commit f8032973ca
16 changed files with 26 additions and 27 deletions
+1 -1
View File
@@ -48,7 +48,7 @@ def infer_mode_type_from_mode(mode):
elif mode.upper() in DATA_MODES:
return "DATA"
else:
if mode.upper() != "OTHER":
if mode.upper() != "OTHER" and mode != "?":
logger.warning(f"Found an unrecognised mode: {mode}. Developer should categorise this.")
return None
@@ -3,8 +3,7 @@ from datetime import datetime
from threading import Event, Thread
import pytz
from requests import ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from core.constants import HTTP_HEADERS
from core.url_data_cache import URLDataCache
+1 -1
View File
@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
import pytz
import xmltodict
from pyhamtools import callinfo
from requests import ConnectTimeout, ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from requests_cache import CachedSession
from core.config import SERVER_OWNER_CALLSIGN
+1 -1
View File
@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
import pytz
import xmltodict
from pyhamtools import callinfo
from requests import ConnectTimeout, ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from requests_cache import CachedSession
from core.constants import HTTP_HEADERS
@@ -3,8 +3,7 @@ from datetime import datetime
from threading import Event, Thread
import pytz
from requests import ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from core.constants import HTTP_HEADERS
from core.url_data_cache import URLDataCache
+1 -2
View File
@@ -4,8 +4,7 @@ from threading import Event, Thread
import pytz
import requests
from requests import ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from core.constants import HTTP_HEADERS
from providers.spot.spot_provider import SpotProvider
+4 -1
View File
@@ -3,7 +3,7 @@ from datetime import datetime
from threading import Event, Lock, Thread
import pytz
from requests_sse import EventSource
from requests_sse import EventSource, InvalidStatusCodeError
from core.constants import HTTP_HEADERS
from providers.spot.spot_provider import SpotProvider
@@ -89,6 +89,9 @@ class SSESpotProvider(SpotProvider):
logger.exception(
f"Exception processing message from SSE Spot Provider ({self.name})"
)
except InvalidStatusCodeError as e:
self.status = "Error"
logger.exception(f"HTTP {e.status_code} returned from SSE Spot Provider ({self.name}).")
finally:
self._set_event_source(None)
@@ -3,8 +3,7 @@ from datetime import datetime
from threading import Event, Thread
import pytz
from requests import ReadTimeout
from requests.exceptions import ConnectionError, ConnectTimeout
from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
from core.constants import HTTP_HEADERS
from core.url_data_cache import URLDataCache
+1 -1
View File
@@ -76,7 +76,7 @@
</div>
<script src="/static/js/add-spot.js?v=1786863565"></script>
<script src="/static/js/add-spot.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -84,7 +84,7 @@
</div>
<script src="/static/js/alerts.js?v=1786863565"></script>
<script src="/static/js/alerts.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -76,8 +76,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1786863565"></script>
<script src="/static/js/bands.js?v=1786863565"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786868765"></script>
<script src="/static/js/bands.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script>
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1786863565" type="text/css">
<link rel="stylesheet" href="/static/css/style.css?v=1786868765" 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">
@@ -15,10 +15,10 @@
window.fetchEventSource = fetchEventSource;
</script>
<script src="/static/js/utils.js?v=1786863565"></script>
<script src="/static/js/ui-ham.js?v=1786863565"></script>
<script src="/static/js/geo.js?v=1786863565"></script>
<script src="/static/js/common.js?v=1786863565"></script>
<script src="/static/js/utils.js?v=1786868765"></script>
<script src="/static/js/ui-ham.js?v=1786868765"></script>
<script src="/static/js/geo.js?v=1786868765"></script>
<script src="/static/js/common.js?v=1786868765"></script>
{% end %}
{% block body %}
<div class="container">
+1 -1
View File
@@ -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=1786863565"></script>
<script src="/static/js/conditions.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -109,8 +109,8 @@
<script src="/static/vendor/js/leaflet-cqzones.js"></script>
<script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786863565"></script>
<script src="/static/js/map.js?v=1786863565"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786868765"></script>
<script src="/static/js/map.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -113,8 +113,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1786863565"></script>
<script src="/static/js/spots.js?v=1786863565"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786868765"></script>
<script src="/static/js/spots.js?v=1786868765"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -86,7 +86,7 @@
</div>
</div>
<script src="/static/js/status.js?v=1786863565"></script>
<script src="/static/js/status.js?v=1786868765"></script>
<script>
$(document).ready(function () {
$("#nav-link-status").addClass("active");