diff --git a/backend/MediaCacheManager.py b/backend/MediaCacheManager.py index 53a83ce..9fe4c75 100644 --- a/backend/MediaCacheManager.py +++ b/backend/MediaCacheManager.py @@ -42,7 +42,7 @@ class ChunkInfo(object): @functools.total_ordering class MediaChunkHolder(object): waiters: collections.deque[asyncio.Future] - requester: list[Request] = [] + requesters: list[Request] = [] unique_id: str = "" info: ChunkInfo callback: Callable = None @@ -108,15 +108,15 @@ class MediaChunkHolder(object): def add_chunk_requester(self, req: Request) -> None: if self.is_completed(): return - self.requester.append(req) + self.requesters.append(req) async def is_disconneted(self) -> bool: - while self.requester: - req = self.requester[0] + while self.requesters: + req = self.requesters[0] if not await req.is_disconnected(): return False try: - self.requester.remove(req) + self.requesters.remove(req) except Exception as err: logger.warning(f"{err=}, trace:{traceback.format_exc()}") return False @@ -148,7 +148,7 @@ class MediaChunkHolder(object): return False # clear all waiter and requester self.notify_waiters() - self.requester.clear() + self.requesters.clear() return True diff --git a/logging_config.yaml b/logging_config.yaml index 9f3a521..2d1f661 100644 --- a/logging_config.yaml +++ b/logging_config.yaml @@ -11,7 +11,7 @@ handlers: timed_rotating_file: class: logging.handlers.TimedRotatingFileHandler filename: logs/app.log - when: midnight + when: 'D' interval: 1 backupCount: 7 level: INFO diff --git a/start.py b/start.py index 6a53aa7..9e3a9d2 100644 --- a/start.py +++ b/start.py @@ -20,7 +20,7 @@ LOGGING_CONFIG["formatters"]["access"]["fmt"] = '[%(levelname)s] %(asctime)s [uv LOGGING_CONFIG["handlers"]["timed_rotating_api_file"] = { "class": "logging.handlers.TimedRotatingFileHandler", "filename": "logs/app.log", - "when": "midnight", + "when": "D", "interval": 1, "backupCount": 7, "level": "INFO", @@ -30,10 +30,6 @@ LOGGING_CONFIG["handlers"]["timed_rotating_api_file"] = { LOGGING_CONFIG["loggers"]["uvicorn"]["handlers"].append("timed_rotating_api_file") LOGGING_CONFIG["loggers"]["uvicorn.access"]["handlers"].append("timed_rotating_api_file") -for handler in logging.getLogger().handlers: - if isinstance(handler, logging.handlers.TimedRotatingFileHandler): - handler.suffix = "%Y-%m-%d" - logger = logging.getLogger(__file__.split("/")[-1]) if __name__ == "__main__":