diff --git a/api/src/shared/database/database.py b/api/src/shared/database/database.py index de086b412..1128c14fd 100644 --- a/api/src/shared/database/database.py +++ b/api/src/shared/database/database.py @@ -96,7 +96,7 @@ def refresh_materialized_view(session: "Session", view_name: str) -> bool: session.execute(text(f"REFRESH MATERIALIZED VIEW CONCURRENTLY {view_name}")) return True except Exception as error: - logging.error(f"Error raised while refreshing view: {error}") + logging.error("Error raised while refreshing view: %s", error) return False diff --git a/functions-python/helpers/feed_status.py b/functions-python/helpers/feed_status.py index aa6ead602..9f4914394 100644 --- a/functions-python/helpers/feed_status.py +++ b/functions-python/helpers/feed_status.py @@ -70,7 +70,7 @@ def get_filters(status: str): .update({Feed.status: status}, synchronize_session=False) ) except Exception as e: - logging.error(f"Error updating feed statuses: {e}") + logging.error("Error updating feed statuses: %s", e) raise Exception(f"Error updating feed statuses: {e}") try: diff --git a/functions-python/update_feed_status/src/main.py b/functions-python/update_feed_status/src/main.py index 13dd84c6a..537c6e746 100644 --- a/functions-python/update_feed_status/src/main.py +++ b/functions-python/update_feed_status/src/main.py @@ -1,17 +1,16 @@ import logging import functions_framework -from shared.helpers.logger import Logger +from shared.helpers.logger import init_logger from shared.helpers.feed_status import update_feed_statuses_query from shared.database.database import with_db_session -logging.basicConfig(level=logging.INFO) +init_logger() @with_db_session @functions_framework.http def update_feed_status(_, db_session): """Updates the Feed status based on the latets dataset service date range.""" - Logger.init_logger() try: logging.info("Database session started.") diff_counts = update_feed_statuses_query(db_session, []) diff --git a/functions-python/update_feed_status/tests/test_update_feed_status_main.py b/functions-python/update_feed_status/tests/test_update_feed_status_main.py index 2f03b94ee..e53cbb49e 100644 --- a/functions-python/update_feed_status/tests/test_update_feed_status_main.py +++ b/functions-python/update_feed_status/tests/test_update_feed_status_main.py @@ -108,9 +108,8 @@ def test_update_feed_status_failed_query(): assert str(e) == "Error updating feed statuses: Mocked exception" -@patch("main.Logger", autospec=True) @patch("main.update_feed_statuses_query") -def test_updated_feed_status(mock_update_query, mock_logger): +def test_updated_feed_status(mock_update_query): return_value = {"active": 5} mock_update_query.return_value = return_value @@ -122,9 +121,8 @@ def test_updated_feed_status(mock_update_query, mock_logger): assert status_code == 200 -@patch("main.Logger", autospec=True) @patch("main.update_feed_statuses_query") -def test_updated_feed_status_error_raised(mock_update_query, mock_logger): +def test_updated_feed_status_error_raised(mock_update_query): mock_update_query.side_effect = Exception("Mocked exception") with patch.dict(os.environ, {"FEEDS_DATABASE_URL": default_db_url}):