feat: avoid disorder by producer-consumer model

This commit is contained in:
lanvent
2023-04-04 05:18:09 +08:00
parent 7458a6298f
commit 5a221848e9
3 changed files with 81 additions and 27 deletions

View File

@@ -5,7 +5,6 @@ wechaty channel
Python Wechaty - https://github.com/wechaty/python-wechaty
"""
import base64
from concurrent.futures import ThreadPoolExecutor
import os
import time
import asyncio
@@ -18,21 +17,18 @@ from bridge.context import *
from channel.chat_channel import ChatChannel
from channel.wechat.wechaty_message import WechatyMessage
from common.log import logger
from common.singleton import singleton
from config import conf
try:
from voice.audio_convert import any_to_sil
except Exception as e:
pass
thread_pool = ThreadPoolExecutor(max_workers=8)
def thread_pool_callback(worker):
worker_exception = worker.exception()
if worker_exception:
logger.exception("Worker return exception: {}".format(worker_exception))
@singleton
class WechatyChannel(ChatChannel):
def __init__(self):
pass
super().__init__()
def startup(self):
config = conf()
@@ -41,6 +37,10 @@ class WechatyChannel(ChatChannel):
asyncio.run(self.main())
async def main(self):
loop = asyncio.get_event_loop()
#将asyncio的loop传入处理线程
self.handler_pool._initializer= lambda: asyncio.set_event_loop(loop)
self.bot = Wechaty()
self.bot.on('login', self.on_login)
self.bot.on('message', self.on_message)
@@ -122,8 +122,4 @@ class WechatyChannel(ChatChannel):
context = self._compose_context(ctype, cmsg.content, isgroup=isgroup, msg=cmsg)
if context:
logger.info('[WX] receiveMsg={}, context={}'.format(cmsg, context))
thread_pool.submit(self._handle_loop, context, asyncio.get_event_loop()).add_done_callback(thread_pool_callback)
def _handle_loop(self,context,loop):
asyncio.set_event_loop(loop)
self._handle(context)
self.produce(context)