From 68a9060d02b1eb35c12843c0f1653809b776b35b Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Wed, 20 Jan 2016 15:54:20 +1030 Subject: Using a hacked faye-websocket, drop EventMachine --- actioncable/lib/action_cable/server/connections.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'actioncable/lib/action_cable/server/connections.rb') diff --git a/actioncable/lib/action_cable/server/connections.rb b/actioncable/lib/action_cable/server/connections.rb index 47dcea8c20..8671dd5ebd 100644 --- a/actioncable/lib/action_cable/server/connections.rb +++ b/actioncable/lib/action_cable/server/connections.rb @@ -22,11 +22,9 @@ 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 - EM.next_tick do - @heartbeat_timer ||= EventMachine.add_periodic_timer(BEAT_INTERVAL) do - EM.next_tick { connections.map(&:beat) } - end - end + @heartbeat_timer ||= Concurrent::TimerTask.new(execution_interval: BEAT_INTERVAL) do + Concurrent.global_io_executor.post { connections.map(&:beat) } + end.tap(&:execute) end def open_connections_statistics -- cgit v1.2.3