mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-07-04 12:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(gateway,feishu): refuse executor resurrection during real shutdown

Browse source 
Add an explicit _closing guard to both owned executors so the
recreate-on-shutdown path only recovers from an *external* teardown of
the loop default — never resurrects a pool the gateway/adapter itself
stopped. _shutdown_*executor() sets the flag; _get_*executor() raises if
closing; feishu connect() re-arms on reconnect. Updates the gateway
recreate test to assert the refusal contract and adds feishu coverage.
This commit is contained in:
teknium1 2026-06-27 03:59:17 -07:00 • committed by Teknium
parent b296915c82
commit 7ee0b68973
4 changed files with 66 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/platforms/feishu/adapter.py
View file

@ -1438,6 +1438,9 @@ class FeishuAdapter(BasePlatformAdapter):
# if it has been shut down. See issue #10849.
self._sdk_executor_lock = threading.Lock()
self._sdk_executor: Optional[concurrent.futures.ThreadPoolExecutor] = None
# Set on disconnect/shutdown so a real teardown can't be resurrected
# by the recreate-on-shutdown path; cleared on connect for reconnects.
self._sdk_executor_closing = False
self._ws_client: Optional[Any] = None
self._ws_future: Optional[asyncio.Future] = None
self._ws_thread_loop: Optional[asyncio.AbstractEventLoop] = None
@ -1652,14 +1655,18 @@ class FeishuAdapter(BasePlatformAdapter):
def _get_sdk_executor(self) -> concurrent.futures.ThreadPoolExecutor:
"""Return the adapter-owned executor for blocking Feishu SDK calls.
Recreates the pool if it was never built or has been shut down, so a
torn-down executor can no longer permanently wedge sends (#10849).
Recreates the pool if it was never built or was shut down by an
*external* teardown of the loop's default executor, so that can no
longer permanently wedge sends (#10849). Refuses to resurrect once
the adapter itself is closing — a real disconnect/shutdown stays shut.
"""
lock = getattr(self, "_sdk_executor_lock", None)
if lock is None:
lock = threading.Lock()
self._sdk_executor_lock = lock
with lock:
if getattr(self, "_sdk_executor_closing", False):
raise RuntimeError("Feishu adapter is shutting down; SDK executor unavailable")
executor = getattr(self, "_sdk_executor", None)
if executor is None or getattr(executor, "_shutdown", False):
executor = concurrent.futures.ThreadPoolExecutor(
@ -1680,6 +1687,7 @@ class FeishuAdapter(BasePlatformAdapter):
if lock is None:
return
with lock:
self._sdk_executor_closing = True
executor = getattr(self, "_sdk_executor", None)
self._sdk_executor = None
if executor is None:
@ -1691,6 +1699,9 @@ class FeishuAdapter(BasePlatformAdapter):
async def connect(self, *, is_reconnect: bool = False) -> bool:
"""Connect to Feishu/Lark."""
# A fresh connect (or reconnect) re-arms the SDK executor after a prior
# disconnect set the closing flag.
self._sdk_executor_closing = False
if not FEISHU_AVAILABLE:
logger.error("[Feishu] lark-oapi not installed")
return False