From 935d0450c038b6c51d31c29ab2ce449848cfd7dc Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Thu, 8 Oct 2015 16:40:33 -0500 Subject: Setup the heartbeat_timer in next tick to make sure EM reactor loop is running --- lib/action_cable/server/connections.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/server/connections.rb b/lib/action_cable/server/connections.rb index 455ff1ab29..4a5e21f5fd 100644 --- a/lib/action_cable/server/connections.rb +++ b/lib/action_cable/server/connections.rb @@ -22,8 +22,10 @@ module ActionCable # then can't rely on being able to receive and send to it. So there's a 3 second heartbeat running on all connections. If the beat fails, we automatically # disconnect. def setup_heartbeat_timer - @heartbeat_timer ||= EventMachine.add_periodic_timer(BEAT_INTERVAL) do - EM.next_tick { connections.map &:beat } + @heartbeat_timer ||= EM.next_tick do + EventMachine.add_periodic_timer(BEAT_INTERVAL) do + EM.next_tick { connections.map &:beat } + end end end -- cgit v1.2.3