diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-04 00:37:03 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-04 00:37:03 +1030 |
| commit | c944ad7323ae00e752515653e3192ad58f10eb23 (patch) | |
| tree | 4ed64ed3d492c6f1ed66d1c21f272527284f2371 | |
| parent | f0528a544c1dbb610574123efc59fe272610cae4 (diff) | |
| parent | 78b0ac32591b8d25fbc67f5292ed5575cb0d9c5a (diff) | |
| download | rails-c944ad7323ae00e752515653e3192ad58f10eb23.tar.gz rails-c944ad7323ae00e752515653e3192ad58f10eb23.tar.bz2 rails-c944ad7323ae00e752515653e3192ad58f10eb23.zip | |
Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnect
ConnectionMonitor is once again notified of disconnect
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/connection.coffee | 1 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee index e8c9ae6bd0..25793ea3d3 100644 --- a/actioncable/app/assets/javascripts/action_cable/connection.coffee +++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee @@ -101,4 +101,5 @@ class ActionCable.Connection disconnect: -> return if @disconnected @disconnected = true + @consumer.connectionMonitor.disconnected() @consumer.subscriptions.notifyAll("disconnected") diff --git a/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee index 740e86643e..904a426644 100644 --- a/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee +++ b/actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee @@ -18,6 +18,7 @@ class ActionCable.ConnectionMonitor disconnected: -> @disconnectedAt = now() + ActionCable.log("ConnectionMonitor disconnected") ping: -> @pingedAt = now() |