fix: 把 Alist 的 session 丢到外面去，减少内存资源负担，修复日志路径问题

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-3.0.17
+3.0.18

core/cluster.py

@@ -155,9 +155,9 @@ async def _check_size(self, file: File, storage: storages.iStorage):
     async def _check_hash(self, file: File, storage: storages.iStorage):
         return await self._check_exists(file, storage) and utils.equals_hash(file.hash, await storage.read_file(file.hash))
 
-    async def get_file(self, hash: str):
+    async def get_file(self, hash: str, use_master: bool = False):
         file = None
-        if await self.available():
+        if await self.available() and not use_master:
             storage = self.get_width_storage()
             if isinstance(storage, storages.LocalStorage) and await storage.exists(hash):
                 return LocalStorageFile(
@@ -1051,6 +1051,9 @@ async def init():
     )
 
 async def unload():
+    for storage in clusters.storage_manager.storages:
+        if isinstance(storage, storages.AlistStorage):
+            await storage.close()
     await clusters.stop()
 
 def check_sign(hash: str, s: str, e: str):
@@ -1076,33 +1079,34 @@ async def _(request: aweb.Request):
         if not check_sign(f"/measure/{size}", s, e):
             return aweb.Response(status=403)
         cluster_id = get_cluster_id_from_sign(f"/measure/{size}", s, e)
-        if not config.const.measure_storage:
-            response = aweb.StreamResponse(
-                status=200,
-                reason="OK",
-                headers={
-                    "Content-Length": str(size * 1024 * 1024),
-                    "Content-Type": "application/octet-stream",
-                },
-            )
-            await response.prepare(request)
-            for _ in range(size):
-                await response.write(MEASURE_BUFFER * 1024 * 1024)
-            await response.write_eof()
-            return response
-        else:
+        if config.const.measure_storage:
             init_measure_block(size)
             await init_measure_files()
             storage = clusters.storage_manager.storages[0]
             if isinstance(storage, storages.AlistStorage):
                 url = await storage.get_url(MEASURES_HASH[size])
                 logger.debug("Requested measure url:", url)
-                return aweb.HTTPFound(url)
+                if url:
+                    return aweb.HTTPFound(url)
             elif isinstance(storage, storages.LocalStorage):
                 return aweb.FileResponse(
                     Path(storage.get_path(MEASURES_HASH[size]))
                 )
-        return aweb.Response(status=400)
+        if config.const.measure_storage:
+            logger.twarning("cluster.warning.measure_storage")
+        response = aweb.StreamResponse(
+            status=200,
+            reason="OK",
+            headers={
+                "Content-Length": str(size * 1024 * 1024),
+                "Content-Type": "application/octet-stream",
+            },
+        )
+        await response.prepare(request)
+        for _ in range(size):
+            await response.write(MEASURE_BUFFER * 1024 * 1024)
+        await response.write_eof()
+        return response
 
 
         """return aweb.HTTPFound(
@@ -1138,8 +1142,11 @@ async def _(request: aweb.Request):
                 user_agent
             )
             return aweb.Response(status=403)
-
-        file = await clusters.storage_manager.get_file(hash)
+        try:
+            file = await clusters.storage_manager.get_file(hash)
+        except:
+            logger.ttraceback("cluster.error.get_file", hash=hash)
+            file = await clusters.storage_manager.get_file(hash, True)
         if file is None:
             db.add_response(
                 address,

core/logger.py

@@ -10,7 +10,7 @@
 _logger = Logger.opt(depth=2)
 _logger.remove()
 _logger.add(
-    f".{LOGGER_DIR}/{{time:YYYY-MM-DD}}.log",
+    f"{LOGGER_DIR}/{{time:YYYY-MM-DD}}.log",
     format=LOGGER_FORMAT,
     retention="90 days",
     encoding="utf-8",

core/storages/__init__.py

@@ -228,6 +228,9 @@ def __init__(self, path: str, width: int, url: str, username: Optional[str], pas
             logger.tinfo("storage.info.alist.link_cache", raw=link_cache_expires, time=units.format_count_datetime(self.link_cache_timeout))
         else:
             logger.tinfo("storage.info.alist.link_cache", raw=link_cache_expires, time="disabled")
+        self.session = aiohttp.ClientSession(
+            self.url
+        )
 
     async def _get_token(self):
         await self.wait_token.wait()
@@ -281,34 +284,32 @@ async def _action_data(self, action: str, url: str, data: Any, headers: dict[str
         hash = hashlib.sha256(f"{action},{url},{data},{headers}".encode()).hexdigest()
         if hash in self.cache:
             return self.cache.get(hash)
-        async with aiohttp.ClientSession(
-            self.url,
+        session = self.session
+        async with session.request(
+            action, url,
+            data=data,
             headers={
                 **headers,
                 **{
                     "Authorization": await self._get_token()
                 }
             }
-        ) as session:
-            async with session.request(
-                action, url,
-                data=data,
-            ) as resp:
-                try:
-                    result = AlistResult(
-                        **await resp.json()
-                    )
-                    if result.code != 200:
-                        logger.terror("storage.error.action_alist", method=action, url=url, status=result.code, message=result.message)
-                        logger.debug(data)
-                        logger.debug(result)
-                    else:
-                        self.cache.set(hash, result, 30)
-                    return result
-                except:
-                    logger.terror("storage.error.alist", status=resp.status, message=await resp.text())
-                    raise
-            
+        ) as resp:
+            try:
+                result = AlistResult(
+                    **await resp.json()
+                )
+                if result.code != 200:
+                    logger.terror("storage.error.action_alist", method=action, url=url, status=result.code, message=result.message)
+                    logger.debug(data)
+                    logger.debug(result)
+                else:
+                    self.cache.set(hash, result, 30)
+                return result
+            except:
+                logger.terror("storage.error.alist", status=resp.status, message=await resp.text())
+                raise
+
     async def __info_file(self, file_hash: str) -> AlistFileInfo:
         r = await self._action_data(
             "post",
@@ -450,4 +451,5 @@ async def write_file(self, file: File, content: bytes, mtime: float | None) -> b
         )
         return result.code == 200
 
-    
+    async def close(self):
+        await self.session.close()

i18n/zh_cn.json

@@ -48,5 +48,6 @@
     "database.error.write": "数据库写入出错，原因:",
     "cluster.info.enable.measure_storage": "已开启 存储 测速",
     "cluster.error.init_measure_file": "无法初始化 测速文件，存储 [${path} (${type})] 大小 [${size}] 哈希 [${hash}]",
-    "storage.info.alist.link_cache": "Alist 存储 [${url}] [${path}] 链接缓存状态 [${time} (${raw})]"
+    "storage.info.alist.link_cache": "Alist 存储 [${url}] [${path}] 链接缓存状态 [${time} (${raw})]",
+    "cluster.error.get_file": "获取文件 ${hash} 出错，原因："
 }