diff options
author | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
commit | bbba0649f529626a076c4247047b60cfbe86d5e4 (patch) | |
tree | cdbf52c160399441574d1f13dd6587ee504e002d /actioncable/lib/action_cable/channel/streams.rb | |
parent | cd73632d9d47752013f46e775e59241215cfd8e9 (diff) | |
parent | a373be9da45d4bee684ea03420212780ec1ef4b1 (diff) | |
download | rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.gz rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.bz2 rails-bbba0649f529626a076c4247047b60cfbe86d5e4.zip |
Merge pull request #23992 from matthewd/em-option
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'actioncable/lib/action_cable/channel/streams.rb')
-rw-r--r-- | actioncable/lib/action_cable/channel/streams.rb | 2 |
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 431a5c1063..23d7320a28 100644 --- a/actioncable/lib/action_cable/channel/streams.rb +++ b/actioncable/lib/action_cable/channel/streams.rb @@ -79,7 +79,7 @@ module ActionCable callback ||= default_stream_callback(broadcasting) streams << [ broadcasting, callback ] - Concurrent.global_io_executor.post do + connection.server.event_loop.post do pubsub.subscribe(broadcasting, callback, lambda do transmit_subscription_confirmation logger.info "#{self.class.name} is streaming from #{broadcasting}" |