fix logs in the loguru
This commit is contained in:
@@ -356,7 +356,7 @@ async def post_audit_drain(identity=Depends(verify_identity_admin_short)):
|
|||||||
count = await drain_audit_redis_to_db(async_session_maker)
|
count = await drain_audit_redis_to_db(async_session_maker)
|
||||||
return {"success": True, "drained": count}
|
return {"success": True, "drained": count}
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.warning("audit-drain failed: %s", exc)
|
logger.warning("audit-drain failed: {}", exc)
|
||||||
raise HTTPException(status_code=500, detail=str(exc)) from exc
|
raise HTTPException(status_code=500, detail=str(exc)) from exc
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -536,7 +536,7 @@ async def record_api_access_event_background(
|
|||||||
reason=reason,
|
reason=reason,
|
||||||
)
|
)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.warning("[Audit] Запись api_access в Redis-буфер не удалась: %s", exc)
|
logger.warning("[Audit] Запись api_access в Redis-буфер не удалась: {}", exc)
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
async with session_factory() as session:
|
async with session_factory() as session:
|
||||||
@@ -1069,7 +1069,7 @@ async def drain_audit_redis_to_db(session_factory: Any) -> int:
|
|||||||
break
|
break
|
||||||
batch = [rec for rec in raw_batch if isinstance(rec, dict)]
|
batch = [rec for rec in raw_batch if isinstance(rec, dict)]
|
||||||
if not batch:
|
if not batch:
|
||||||
logger.warning("[Audit] drain_audit_redis_to_db: отброшен пустой/битый батч (%s элементов)", len(raw_batch))
|
logger.warning("[Audit] drain_audit_redis_to_db: отброшен пустой/битый батч ({} элементов)", len(raw_batch))
|
||||||
await cache_lpop_batch(_AUDIT_REDIS_PROCESSING_KEY, len(raw_batch))
|
await cache_lpop_batch(_AUDIT_REDIS_PROCESSING_KEY, len(raw_batch))
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
@@ -1115,7 +1115,7 @@ async def drain_audit_redis_to_db(session_factory: Any) -> int:
|
|||||||
await cache_lpop_batch(_AUDIT_REDIS_PROCESSING_KEY, len(raw_batch))
|
await cache_lpop_batch(_AUDIT_REDIS_PROCESSING_KEY, len(raw_batch))
|
||||||
total += inserted_count
|
total += inserted_count
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.warning("[Audit] drain_audit_redis_to_db батч не записан, останется в Redis processing: %s", exc)
|
logger.warning("[Audit] drain_audit_redis_to_db батч не записан, останется в Redis processing: {}", exc)
|
||||||
break
|
break
|
||||||
return total
|
return total
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
@@ -385,7 +385,7 @@ async def _build_audit_report(session: AsyncSession, source: str = "db") -> tupl
|
|||||||
lines.append(f" • {step['label']}: {step['count']} польз.{conv}")
|
lines.append(f" • {step['label']}: {step['count']} польз.{conv}")
|
||||||
return ("\n".join(lines), None)
|
return ("\n".join(lines), None)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception("Ошибка при получении аудита: %s", e)
|
logger.exception("Ошибка при получении аудита: {}", e)
|
||||||
return (None, str(e))
|
return (None, str(e))
|
||||||
|
|
||||||
|
|
||||||
@@ -485,7 +485,7 @@ async def handle_audit_reset_do(callback_query: CallbackQuery, session: AsyncSes
|
|||||||
except TelegramBadRequest:
|
except TelegramBadRequest:
|
||||||
pass
|
pass
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.exception("Ошибка при сбросе аудита (%s): %s", source, e)
|
logger.exception("Ошибка при сбросе аудита ({}): {}", source, e)
|
||||||
await callback_query.answer("Не удалось сбросить аудит", show_alert=True)
|
await callback_query.answer("Не удалось сбросить аудит", show_alert=True)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user