diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-28 14:58:28 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-28 14:58:28 +0100 |
| commit | dabf47938f17f34d3146e72e1ba7c45defc92379 (patch) | |
| tree | f76d347f5ba62627954a96eef5176cbf475662be /actioncable/lib/action_cable/channel | |
| parent | 2280c84ffe278fd29217a7997db3739b38dbcc92 (diff) | |
| parent | bbe59375d074366b39d08ed078f0da02c7dddae1 (diff) | |
| download | rails-dabf47938f17f34d3146e72e1ba7c45defc92379.tar.gz rails-dabf47938f17f34d3146e72e1ba7c45defc92379.tar.bz2 rails-dabf47938f17f34d3146e72e1ba7c45defc92379.zip | |
Merge pull request #23811 from iamvery/string-channel
Ensure actioncable behaves as expected with non-string queues
Diffstat (limited to 'actioncable/lib/action_cable/channel')
| -rw-r--r-- | actioncable/lib/action_cable/channel/streams.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb index ff2994f198..431a5c1063 100644 --- a/actioncable/lib/action_cable/channel/streams.rb +++ b/actioncable/lib/action_cable/channel/streams.rb @@ -72,6 +72,7 @@ module ActionCable # Start streaming from the named <tt>broadcasting</tt> pubsub queue. Optionally, you can pass a <tt>callback</tt> that'll be used # instead of the default of just transmitting the updates straight to the subscriber. def stream_from(broadcasting, callback = nil) + broadcasting = String(broadcasting) # Don't send the confirmation until pubsub#subscribe is successful defer_subscription_confirmation! |