From bc913a85ec8a1db52c7297173e41fb4b23ddea04 Mon Sep 17 00:00:00 2001 From: Ian Renton Date: Sun, 21 Jun 2026 08:17:31 +0100 Subject: [PATCH] Fix double logging and improve GMA logging --- spothole.py | 3 ++- spotproviders/gma.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 +- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/spothole.py b/spothole.py index d066767..3657487 100644 --- a/spothole.py +++ b/spothole.py @@ -87,8 +87,9 @@ if __name__ == '__main__': root.setLevel(logging.INFO) handler = logging.StreamHandler(sys.stdout) handler.setLevel(logging.INFO) - formatter = logging.Formatter("%(message)s") + formatter = logging.Formatter("%(levelname)s : %(message)s") handler.setFormatter(formatter) + root.handlers.clear() root.addHandler(handler) logging.info("Starting...") diff --git a/spotproviders/gma.py b/spotproviders/gma.py index 1ef30e2..6cc8481 100644 --- a/spotproviders/gma.py +++ b/spotproviders/gma.py @@ -95,6 +95,6 @@ class GMA(HTTPSpotProvider): logging.warning("Exception when looking up " + self.REF_INFO_URL_ROOT + source_spot[ "REF"] + ", ignoring this spot for now") else: - logging.warning("The GMA API returned an unexpected response.") + logging.warning(f"The GMA API returned an unexpected response (HTTP {http_response.status_code}).") return new_spots diff --git a/templates/add_spot.html b/templates/add_spot.html index 756b4ce..c14f8cf 100644 --- a/templates/add_spot.html +++ b/templates/add_spot.html @@ -76,7 +76,7 @@ - + diff --git a/templates/alerts.html b/templates/alerts.html index aded168..e222204 100644 --- a/templates/alerts.html +++ b/templates/alerts.html @@ -75,7 +75,7 @@ - + diff --git a/templates/bands.html b/templates/bands.html index b961655..7630b85 100644 --- a/templates/bands.html +++ b/templates/bands.html @@ -77,8 +77,8 @@ - - + + diff --git a/templates/base.html b/templates/base.html index 90e96ef..b907e39 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,6 @@ {% extends "skeleton.html" %} {% block head_extra %} - + @@ -10,10 +10,10 @@ - - - - + + + + {% end %} {% block body %}
diff --git a/templates/conditions.html b/templates/conditions.html index d31f987..90cfdae 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -284,7 +284,7 @@
- + diff --git a/templates/map.html b/templates/map.html index d7feb6c..a8ab33c 100644 --- a/templates/map.html +++ b/templates/map.html @@ -95,8 +95,8 @@ - - + + diff --git a/templates/spots.html b/templates/spots.html index 63e8b81..d2b5628 100644 --- a/templates/spots.html +++ b/templates/spots.html @@ -116,8 +116,8 @@ - - + + diff --git a/templates/status.html b/templates/status.html index 6b6ac69..b1e3f0d 100644 --- a/templates/status.html +++ b/templates/status.html @@ -59,7 +59,7 @@ - +