Skip to content

fix(weixin): skip live adapter reuse in send_weixin_direct when on a different event loop #12810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yueyefengs wants to merge 1 commit into from
Closed

fix(weixin): skip live adapter reuse in send_weixin_direct when on a different event loop #12810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions gateway/platforms/weixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,7 @@ async def connect(self) -> bool:

self._poll_session = aiohttp.ClientSession(trust_env=True, connector=_make_ssl_connector())
self._send_session = aiohttp.ClientSession(trust_env=True, connector=_make_ssl_connector())
self._event_loop = asyncio.get_running_loop()
self._token_store.restore(self._account_id)
self._poll_task = asyncio.create_task(self._poll_loop(), name="weixin-poll")
self._mark_connected()
Expand Down Expand Up @@ -1982,7 +1983,19 @@ async def send_weixin_direct(

live_adapter = _LIVE_ADAPTERS.get(resolved_token)
send_session = getattr(live_adapter, '_send_session', None)
# Only reuse the live adapter's session when we're on the same event loop it
# was created on. When the cron scheduler falls back to the standalone path,
# it runs send_weixin_direct inside asyncio.run() on a *fresh* loop; reusing
# a session from the gateway loop causes aiohttp's asyncio.timeout() to raise
# "Timeout context manager should be used inside a task".
_use_live = False
if live_adapter is not None and send_session is not None and not send_session.closed:
try:
_adapter_loop = getattr(live_adapter, '_event_loop', None)
_use_live = (_adapter_loop is not None and _adapter_loop is asyncio.get_running_loop())
except RuntimeError:
pass
if _use_live:
last_result: Optional[SendResult] = None
cleaned = live_adapter.format_message(message)
if cleaned:
Expand Down