From 890946c977985384c2ca3173dae3702f444f3325 Mon Sep 17 00:00:00 2001 From: Holger Bruch Date: Wed, 13 Aug 2025 20:42:14 +0200 Subject: [PATCH 1/2] fix: don't ignore data/conf/mfdz.json --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aefe829..b044eb8 100644 --- a/.gitignore +++ b/.gitignore @@ -138,7 +138,8 @@ gtfs/*.zip gtfs/*.pbf gtfs/*.json -# data/agencyconf is explictly not ignored, as needed for tests +data/agencyconf/ +!data/agencyconf/mfdz.json data/carpool/ data/enhanced/ data/failed/ From 47811b642329def130c0610cc17d1a986e8371b9 Mon Sep 17 00:00:00 2001 From: Holger Bruch Date: Sat, 30 Aug 2025 09:08:31 +0200 Subject: [PATCH 2/2] fix: handle exceptions gracefully --- amarillo/configuration.py | 7 +++++-- amarillo/services/gtfs.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/amarillo/configuration.py b/amarillo/configuration.py index 3433ea5..5f68229 100644 --- a/amarillo/configuration.py +++ b/amarillo/configuration.py @@ -79,8 +79,11 @@ def configure_enhancer_services(): # notify carpool about carpools in trash, as delete notifications must be sent for carpool_file_name in glob(f'data/trash/{agency_id}/*.json'): with open(carpool_file_name) as carpool_file: - carpool = Carpool(**(json.load(carpool_file))) - container['carpools'].delete(carpool.agency, carpool.id) + try: + carpool = Carpool(**(json.load(carpool_file))) + container['carpools'].delete(carpool.agency, carpool.id) + except Exception as e: + logger.warning("Issue during deletion of carpool %s: %s", carpool_file_name, repr(e)) logger.info("Restored carpools: %s", container['carpools'].get_all_ids()) logger.info("Starting scheduler") diff --git a/amarillo/services/gtfs.py b/amarillo/services/gtfs.py index de3abb0..5a9ebcd 100644 --- a/amarillo/services/gtfs.py +++ b/amarillo/services/gtfs.py @@ -141,4 +141,5 @@ def _as_added_updates(self, trip, fromdate): 'stopTimeUpdate': self._to_stop_times(trip, trip_date) } for trip_date in trip.next_trip_dates(fromdate)] except AttributeError: - logger.error(f"Error adding updates for trip {trip.trip_id}") + logger.exception(f"Error adding updates for trip {trip.trip_id}") + return []