hehesheng/TgToFileSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: logs

Browse Source
This commit is contained in:
hehesheng 2024-06-05 23:54:21 +08:00
parent 312483e9fb
commit 6711e30ffc
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/MediaCacheManager.py
View File

@ -42,7 +42,7 @@ class ChunkInfo(object):
@functools.total_ordering @functools.total_ordering
class MediaChunkHolder(object): class MediaChunkHolder(object):
waiters: collections.deque[asyncio.Future] waiters: collections.deque[asyncio.Future]
requester: list[Request] = [] requesters: list[Request] = []
unique_id: str = "" unique_id: str = ""
info: ChunkInfo info: ChunkInfo
callback: Callable = None callback: Callable = None
@ -108,15 +108,15 @@ class MediaChunkHolder(object):
def add_chunk_requester(self, req: Request) -> None: def add_chunk_requester(self, req: Request) -> None:
if self.is_completed(): if self.is_completed():
return return
self.requester.append(req) self.requesters.append(req)
async def is_disconneted(self) -> bool: async def is_disconneted(self) -> bool:
while self.requester: while self.requesters:
req = self.requester[0] req = self.requesters[0]
if not await req.is_disconnected(): if not await req.is_disconnected():
return False return False
try: try:
self.requester.remove(req) self.requesters.remove(req)
except Exception as err: except Exception as err:
logger.warning(f"{err=}, trace:{traceback.format_exc()}") logger.warning(f"{err=}, trace:{traceback.format_exc()}")
return False return False
@ -148,7 +148,7 @@ class MediaChunkHolder(object):
return False return False
# clear all waiter and requester # clear all waiter and requester
self.notify_waiters() self.notify_waiters()
self.requester.clear() self.requesters.clear()
return True return True

2
logging_config.yaml
View File

@ -11,7 +11,7 @@ handlers:
timed_rotating_file: timed_rotating_file:
class: logging.handlers.TimedRotatingFileHandler class: logging.handlers.TimedRotatingFileHandler
filename: logs/app.log filename: logs/app.log
when: midnight when: 'D'
interval: 1 interval: 1
backupCount: 7 backupCount: 7
level: INFO level: INFO

6
start.py
View File

@ -20,7 +20,7 @@ LOGGING_CONFIG["formatters"]["access"]["fmt"] = '[%(levelname)s] %(asctime)s [uv
LOGGING_CONFIG["handlers"]["timed_rotating_api_file"] = { LOGGING_CONFIG["handlers"]["timed_rotating_api_file"] = {
"class": "logging.handlers.TimedRotatingFileHandler", "class": "logging.handlers.TimedRotatingFileHandler",
"filename": "logs/app.log", "filename": "logs/app.log",
"when": "midnight", "when": "D",
"interval": 1, "interval": 1,
"backupCount": 7, "backupCount": 7,
"level": "INFO", "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"]["handlers"].append("timed_rotating_api_file")
LOGGING_CONFIG["loggers"]["uvicorn.access"]["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]) logger = logging.getLogger(__file__.split("/")[-1])
if __name__ == "__main__": if __name__ == "__main__":