Merge pull request #4 from tommilligan/more-robust

tommilligan · web-flow · commit 298c5037c1bd · 2025-09-03T15:16:21.000+01:00
More robust
diff --git a/main.py b/main.py
@@ -11,7 +11,6 @@
 from enum import Enum
 from typing import Callable, Iterable, List, Optional, Protocol, Union
 
-import backoff
 import recurring_ical_events
 from dotenv import load_dotenv
 import icalendar
@@ -25,8 +24,6 @@
 
 _log = logging.getLogger(__file__)
 
-_DEFAULT_DISPLAY = " " * 8 + "."
-
 
 class Uninitialized(Enum):
     """Indicates a missing value."""
@@ -95,13 +92,6 @@ def fetch(self) -> icalendar.cal.Component:
         calendar = icalendar.Calendar.from_ical(ics)
         return calendar
 
-    @backoff.on_exception(
-        backoff.expo,
-        RequestException,
-        max_tries=5,
-        logger=_log,
-        backoff_log_level=logging.WARNING,
-    )
     def _fetch_remote(self) -> str:
         _log.info("Fetching ics file from remote url %r", self._ics_url)
         return self._session.get(self._ics_url).text
@@ -294,6 +284,7 @@ def run(self) -> None:
     def poll(self) -> None:
         try:
             self._calendar = self._calendar_queue.get(timeout=self._poll_interval)
+            _log.info("Loaded new calendar for RelevantMarkExtractor")
         except queue.Empty:
             pass
 
@@ -416,18 +407,23 @@ def run(self) -> None:
         calendar_queue = queue.Queue(1)
         relevant_mark_queue = queue.Queue(1)
 
-        def calendar_fetcher_loop() -> None:
-            _log.debug("Fetching calendar")
-            calendar = self._calendar_fetcher.fetch()
+        def calendar_fetcher_poll() -> None:
+            _log.info("Fetching calendar")
+            try:
+                calendar = self._calendar_fetcher.fetch()
+            except RequestException:
+                _log.exception("Fetching calendar failed, no calendar added to queue")
+                return
+
             try:
                 calendar_queue.put(calendar)
             except queue.Full:
                 pass
-            _log.debug("Fetched calendar")
+            _log.info("Fetched calendar")
 
         def calender_fetcher_run() -> None:
             poll_until_shutdown(
-                calendar_fetcher_loop,
+                calendar_fetcher_poll,
                 self._calendar_fetch_interval,
                 self._shutdown_event,
             )
