Adding more details to Archive slow_logger.

This commit is contained in:
Roland 2023-04-12 11:51:28 -06:00
parent 6fe536558a
commit 5e206fd9a2
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 14 additions and 15 deletions

View file

@ -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

View file

@ -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()