diff --git a/src/main.py b/src/main.py index 05f6204..fc90bf4 100644 --- a/src/main.py +++ b/src/main.py @@ -247,7 +247,7 @@ def main(version): # pylint: disable=unused-argument base_log_level = os.environ.get("LOGLEVEL", profile_base_log_level).upper() lib_log_level = os.environ.get("LIBLOGLEVEL", profile_lib_log_level).upper() log_levels = { - __name__: base_log_level, + None: base_log_level, "PIL": lib_log_level, "urllib3": lib_log_level, } diff --git a/src/store/managers/manager.py b/src/store/managers/manager.py index 01535bc..c2c94f8 100644 --- a/src/store/managers/manager.py +++ b/src/store/managers/manager.py @@ -56,22 +56,24 @@ class Manager: self.manager_logic(game) except Exception as error: # Handle unretryable errors - log_args = (type(error).__name__, self.name, game.game_id) - if type(error) in self.retryable_on: - logging.error("Unretryable %s in %s for %s", *log_args) + log_args = (type(error).__name__, self.name, game.name, game.game_id) + if type(error) not in self.retryable_on: + logging.error("Unretryable %s in %s for %s (%s)", *log_args) self.report_error(error) break # Handle being out of retries elif remaining_tries == 0: - logging.error("Too many retries due to %s in %s for %s", *log_args) + logging.error( + "Too many retries due to %s in %s for %s (%s)", *log_args + ) self.report_error(error) break # Retry else: - logging.debug("Retry caused by %s in %s for %s", *log_args) + logging.debug("Retry caused by %s in %s for %s (%s)", *log_args) continue def process_game(self, game: Game, callback: Callable[["Manager"], Any]) -> None: """Pass the game through the manager""" - self.execute_resilient_manager_logic(game, tries=0) + self.execute_resilient_manager_logic(game) callback(self) diff --git a/src/store/managers/sgdb_manager.py b/src/store/managers/sgdb_manager.py index 27ca8de..2179ee9 100644 --- a/src/store/managers/sgdb_manager.py +++ b/src/store/managers/sgdb_manager.py @@ -1,9 +1,7 @@ -from requests import HTTPError - from src.game import Game from src.store.managers.async_manager import AsyncManager from src.store.managers.steam_api_manager import SteamAPIManager -from src.utils.steamgriddb import HTTPError, SGDBAuthError, SGDBError, SGDBHelper +from src.utils.steamgriddb import HTTPError, SGDBAuthError, SGDBHelper class SGDBManager(AsyncManager): diff --git a/src/utils/steam.py b/src/utils/steam.py index ba5c649..458dc77 100644 --- a/src/utils/steam.py +++ b/src/utils/steam.py @@ -66,11 +66,9 @@ class SteamHelper: ) as response: response.raise_for_status() data = response.json()[appid] - - except (HTTPError, JSONDecodeError) as error: - logging.warning("Error while querying Steam API for %s", appid) + except HTTPError as error: + logging.warning("Steam API HTTP error for %s", appid, exc_info=error) raise error - if not data["success"]: logging.debug("Appid %s not found", appid) raise SteamGameNotFoundError()