aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/connection
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/connection
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/connection')
-rw-r--r--actioncable/lib/action_cable/connection/internal_channel.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/connection/internal_channel.rb b/actioncable/lib/action_cable/connection/internal_channel.rb
index 54ed7672d2..27826792b3 100644
--- a/actioncable/lib/action_cable/connection/internal_channel.rb
+++ b/actioncable/lib/action_cable/connection/internal_channel.rb
@@ -15,14 +15,14 @@ module ActionCable
@_internal_subscriptions ||= []
@_internal_subscriptions << [ internal_channel, callback ]
- EM.next_tick { pubsub.subscribe(internal_channel, callback) }
+ Concurrent.global_io_executor.post { pubsub.subscribe(internal_channel, callback) }
logger.info "Registered connection (#{connection_identifier})"
end
end
def unsubscribe_from_internal_channel
if @_internal_subscriptions.present?
- @_internal_subscriptions.each { |channel, callback| EM.next_tick { pubsub.unsubscribe(channel, callback) } }
+ @_internal_subscriptions.each { |channel, callback| Concurrent.global_io_executor.post { pubsub.unsubscribe(channel, callback) } }
end
end