Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-07-18 00:55:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Prevent redundant shutdown calls in StreamGenerator and clean up profile managers in ProxyServer
Some checks are pending
CI Pipeline / prepare (push) Waiting to run
Details
CI Pipeline / docker (amd64, ubuntu-24.04) (push) Blocked by required conditions
Details
CI Pipeline / docker (arm64, ubuntu-24.04-arm) (push) Blocked by required conditions
Details
CI Pipeline / create-manifest (push) Blocked by required conditions
Details
Build and Push Multi-Arch Docker Image / build-and-push (push) Waiting to run
Details

Browse source
This commit is contained in:
SergeantPanda 2026-05-11 17:34:54 -05:00
parent ba76a4d5f2
commit 1107423893
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/proxy/live_proxy/output/ts/generator.py
View file

@ -624,6 +624,14 @@ class StreamGenerator:
# If no clients left and we're the owner, schedule shutdown using the config value
if local_clients == 0 and proxy_server.am_i_owner(self.channel_id):
# When output/profile managers are present, remove_client already spawned
# handle_client_disconnect which will stop them and then stop the channel.
# Spawning a second shutdown greenlet here causes a redundant concurrent
# stop_channel call that can race against the first.
if (proxy_server.output_managers.get(self.channel_id) or
proxy_server.profile_managers.get(self.channel_id)):
return
logger.info(f"No local clients left for channel {self.channel_id}, scheduling shutdown")
def delayed_shutdown():

13
apps/proxy/live_proxy/server.py
View file

@ -219,8 +219,9 @@ class ProxyServer:
client_id = data.get("client_id")
worker_id = data.get("worker_id")
logger.debug(f"Owner received {EventType.CLIENT_DISCONNECTED} event for channel {channel_id}, client {client_id} from worker {worker_id}")
# Delegate to dedicated method
self.handle_client_disconnect(channel_id)
# Spawn to avoid blocking the pubsub listener thread
# during the full shutdown path (thread joins, Redis cleanup).
gevent.spawn(self.handle_client_disconnect, channel_id)
elif event_type == EventType.STREAM_SWITCH:
@ -1336,6 +1337,14 @@ class ProxyServer:
except KeyError:
logger.debug(f"Client manager for channel {channel_id} already removed")
# Clean up profile managers and buffers. Owner workers clean profile_managers
# (and their profile_buffers) via stop_all_output_profiles above. Non-owner
# workers only populate profile_buffers (not profile_managers), and that block
# is skipped for them, so we always clean both here to avoid stale entries on
# the next connect.
self.profile_managers.pop(channel_id, None)
self.profile_buffers.pop(channel_id, None)
# Clean up Redis keys
self._clean_redis_keys(channel_id)