fix: 修复nakuru无法运行的问题

This commit is contained in:
RockChinQ
2024-02-12 13:37:41 +08:00
parent abc19e78b8
commit 991a0aa5f6
3 changed files with 23 additions and 9 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ class Controller:
except Exception as e: except Exception as e:
self.ap.logger.error(f"处理请求时出错 query_id={query.query_id}: {e}") self.ap.logger.error(f"处理请求时出错 query_id={query.query_id}: {e}")
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}") self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
# traceback.print_exc() traceback.print_exc()
finally: finally:
self.ap.logger.debug(f"Query {query} processed") self.ap.logger.debug(f"Query {query} processed")
+13 -1
View File
@@ -101,8 +101,12 @@ class PlatformManager:
adapter=adapter adapter=adapter
) )
index = 0
for adap_cfg in self.ap.platform_cfg.data['platform-adapters']: for adap_cfg in self.ap.platform_cfg.data['platform-adapters']:
if adap_cfg['enable']: if adap_cfg['enable']:
self.ap.logger.info(f'初始化平台适配器 {index}: {adap_cfg["adapter"]}')
index += 1
cfg_copy = adap_cfg.copy() cfg_copy = adap_cfg.copy()
del cfg_copy['enable'] del cfg_copy['enable']
adapter_name = cfg_copy['adapter'] adapter_name = cfg_copy['adapter']
@@ -179,7 +183,14 @@ class PlatformManager:
try: try:
tasks = [] tasks = []
for adapter in self.adapters: for adapter in self.adapters:
tasks.append(adapter.run_async()) async def exception_wrapper(adapter):
try:
await adapter.run_async()
except Exception as e:
self.ap.logger.error('平台适配器运行出错: ' + str(e))
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
tasks.append(exception_wrapper(adapter))
for task in tasks: for task in tasks:
asyncio.create_task(task) asyncio.create_task(task)
@@ -187,3 +198,4 @@ class PlatformManager:
except Exception as e: except Exception as e:
self.ap.logger.error('平台适配器运行出错: ' + str(e)) self.ap.logger.error('平台适配器运行出错: ' + str(e))
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}") self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
+9 -7
View File
@@ -1,4 +1,5 @@
from __future__ import annotations # 加了之后会导致:https://github.com/Lxns-Network/nakuru-project/issues/25
# from __future__ import annotations
import asyncio import asyncio
import typing import typing
@@ -12,7 +13,6 @@ import nakuru.entities.components as nkc
from .. import adapter as adapter_model from .. import adapter as adapter_model
from ...pipeline.longtext.strategies import forward from ...pipeline.longtext.strategies import forward
from ...core import app
class NakuruProjectMessageConverter(adapter_model.MessageConverter): class NakuruProjectMessageConverter(adapter_model.MessageConverter):
@@ -170,11 +170,11 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
listener_list: list[dict] listener_list: list[dict]
ap: app.Application # ap: app.Application
cfg: dict cfg: dict
def __init__(self, cfg: dict, ap: app.Application): def __init__(self, cfg: dict, ap):
"""初始化nakuru-project的对象""" """初始化nakuru-project的对象"""
cfg['port'] = cfg['ws_port'] cfg['port'] = cfg['ws_port']
del cfg['ws_port'] del cfg['ws_port']
@@ -261,8 +261,10 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
): ):
try: try:
source_cls = NakuruProjectEventConverter.yiri2target(event_type)
# 包装函数 # 包装函数
async def listener_wrapper(app: nakuru.CQHTTP, source: NakuruProjectAdapter.event_converter.yiri2target(event_type)): async def listener_wrapper(app: nakuru.CQHTTP, source: source_cls):
await callback(self.event_converter.target2yiri(source), self) await callback(self.event_converter.target2yiri(source), self)
# 将包装函数和原函数的对应关系存入列表 # 将包装函数和原函数的对应关系存入列表
@@ -275,7 +277,7 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
) )
# 注册监听器 # 注册监听器
self.bot.receiver(self.event_converter.yiri2target(event_type).__name__)(listener_wrapper) self.bot.receiver(source_cls.__name__)(listener_wrapper)
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
raise e raise e
@@ -325,7 +327,7 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
await self.bot._run() await self.bot._run()
self.ap.logger.info("运行 Nakuru 适配器") self.ap.logger.info("运行 Nakuru 适配器")
while True: while True:
await asyncio.sleep(100) await asyncio.sleep(1)
def kill(self) -> bool: def kill(self) -> bool:
return False return False