opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-07-31 01:09:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(socketio): omit socket_timeout from RedisManager pub/sub options (#39587)

Browse Source 
Signed-off-by: sergioperezcheco <checo520@outlook.com>
This commit is contained in:
Checo 2026-07-30 08:50:21 +08:00 committed by GitHub
parent 72c20daa61
commit 832f42a996
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/extensions/ext_socketio.py
View File

@ -20,9 +20,14 @@ def _get_ssl_cert_reqs() -> ssl.VerifyMode:
def _build_redis_options(redis_url: str) -> dict[str, Any]:
"""Build Redis options for Socket.IO's cross-process pub/sub manager."""
"""Build Redis options for Socket.IO's cross-process pub/sub manager.
Note: ``socket_timeout`` is intentionally omitted. The RedisManager runs a
blocking ``pubsub.listen()`` loop that idles indefinitely between messages;
applying a read timeout there causes a reconnect storm (issue #39423).
``socket_connect_timeout`` still guards connection establishment.
"""
options: dict[str, Any] = {
"socket_timeout": dify_config.REDIS_SOCKET_TIMEOUT,
"socket_connect_timeout": dify_config.REDIS_SOCKET_CONNECT_TIMEOUT,
"health_check_interval": dify_config.REDIS_HEALTH_CHECK_INTERVAL,
"protocol": dify_config.REDIS_SERIALIZATION_PROTOCOL,

12
api/tests/unit_tests/extensions/test_ext_socketio.py
View File

@ -31,3 +31,15 @@ def test_build_redis_options_includes_tls_options_for_rediss(monkeypatch) -> Non
assert options["ssl_ca_certs"] == "/ca.pem"
assert options["ssl_certfile"] == "/cert.pem"
assert options["ssl_keyfile"] == "/key.pem"
def test_build_redis_options_omits_socket_timeout(monkeypatch) -> None:
# socket_timeout must not be passed to RedisManager because the pub/sub
# listen loop blocks indefinitely between messages; a read timeout there
# triggers an infinite reconnect storm (issue #39423).
monkeypatch.setattr(ext_socketio.dify_config, "REDIS_SOCKET_TIMEOUT", 5.0)
options = ext_socketio._build_redis_options("redis://redis.example.com:6380/3")
assert "socket_timeout" not in options
assert "socket_connect_timeout" in options