From 5e206fd9a22db32ce8c7445fab2801fb960e9a42 Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 12 Apr 2023 11:51:28 -0600 Subject: [PATCH] Adding more details to Archive slow_logger. --- modules/archive/__init__.py | 25 ++++++++++++------------- wrolpi/common.py | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/archive/__init__.py b/modules/archive/__init__.py index 5e1bfdec..bab96877 100644 --- a/modules/archive/__init__.py +++ b/modules/archive/__init__.py @@ -158,22 +158,21 @@ async def archive_modeler(): for file_group, archive in results: processed += 1 - if archive: - try: - with slow_logger(1, f'Modeling old archive took %(elapsed)s seconds'): + with slow_logger(1, f'Modeling archive took %(elapsed)s seconds: {file_group}', logger__=logger): + if archive: + try: archive_id = archive.id archive.validate() - except Exception: - logger.error(f'Unable to validate Archive {archive_id}') - if PYTEST: - raise - else: - try: - with slow_logger(1, f'Modeling new archive took %(elapsed)s seconds'): + except Exception: + logger.error(f'Unable to validate Archive {archive_id}') + if PYTEST: + raise + else: + try: model_archive(file_group, session=session) - except InvalidArchive: - # May not be a real Singlefile archive. - pass + except InvalidArchive: + # May not be a real Singlefile archive. + pass # Even if indexing fails, we mark it as indexed. We won't retry indexing this. file_group.indexed = True diff --git a/wrolpi/common.py b/wrolpi/common.py index 1f611b4d..74ef65a7 100644 --- a/wrolpi/common.py +++ b/wrolpi/common.py @@ -940,14 +940,14 @@ def timer(name): @contextlib.contextmanager -def slow_logger(max_seconds: int, message: str): +def slow_logger(max_seconds: int, message: str, logger__=logger, level=logging.WARNING): before = now() try: yield finally: elapsed = (now() - before).total_seconds() if elapsed >= max_seconds: - logger.warning(message % dict(elapsed=elapsed)) + logger__.log(level, message % dict(elapsed=elapsed)) TIMERS = dict()