diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-01 15:14:43 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-10-01 15:18:39 +0930 |
| commit | 9588a3d66d4ca6ba122d32417aa62680f441bf40 (patch) | |
| tree | 633978aa86df6eaed98595d54754b89a2b5fbbb8 /actioncable/lib/action_cable/channel/streams.rb | |
| parent | 72f97e281059bc983eef5bc8915e53249c623dff (diff) | |
| parent | 3e68d8b872b48ecb45268a7e5fcb937e68f2724f (diff) | |
| download | rails-9588a3d66d4ca6ba122d32417aa62680f441bf40.tar.gz rails-9588a3d66d4ca6ba122d32417aa62680f441bf40.tar.bz2 rails-9588a3d66d4ca6ba122d32417aa62680f441bf40.zip | |
Merge pull request #26547 from palkan/fix/actioncable-confirmation-race-condition
Avoid race condition on subscription confirmation
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 13deb62662..dbba333353 100644 --- a/actioncable/lib/action_cable/channel/streams.rb +++ b/actioncable/lib/action_cable/channel/streams.rb @@ -84,7 +84,7 @@ module ActionCable connection.server.event_loop.post do pubsub.subscribe(broadcasting, handler, lambda do - transmit_subscription_confirmation + ensure_confirmation_sent logger.info "#{self.class.name} is streaming from #{broadcasting}" end) end |