aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/channel/streams.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-01-20 15:54:20 +1030
committerMatthew Draper <matthew@trebex.net>2016-01-24 22:51:06 +1030
commit68a9060d02b1eb35c12843c0f1653809b776b35b (patch)
treecde309fbbd468e972a1e01df4f50c1d2bbe119b4 /actioncable/lib/action_cable/channel/streams.rb
parentdcdadd5e82eed2e64d21399599b14501c3e16cc3 (diff)
downloadrails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.gz
rails-68a9060d02b1eb35c12843c0f1653809b776b35b.tar.bz2
rails-68a9060d02b1eb35c12843c0f1653809b776b35b.zip
Using a hacked faye-websocket, drop EventMachine
Diffstat (limited to 'actioncable/lib/action_cable/channel/streams.rb')
-rw-r--r--actioncable/lib/action_cable/channel/streams.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb
index e2876ef6fa..a26373e387 100644
--- a/actioncable/lib/action_cable/channel/streams.rb
+++ b/actioncable/lib/action_cable/channel/streams.rb
@@ -75,7 +75,7 @@ module ActionCable
callback ||= default_stream_callback(broadcasting)
streams << [ broadcasting, callback ]
- EM.next_tick do
+ Concurrent.global_io_executor.post do
pubsub.subscribe(broadcasting, callback, lambda do
transmit_subscription_confirmation
logger.info "#{self.class.name} is streaming from #{broadcasting}"