aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rhodes <rhodes.daniel@gmail.com>2016-03-03 11:46:51 +0100
committerDaniel Rhodes <rhodes.daniel@gmail.com>2016-03-03 15:00:11 +0100
commit78b0ac32591b8d25fbc67f5292ed5575cb0d9c5a (patch)
tree108f57d51b2d25153334151611660d0e547459e9
parent2c53e27992500ab0e68db18ea71ad58f6c845edb (diff)
downloadrails-78b0ac32591b8d25fbc67f5292ed5575cb0d9c5a.tar.gz
rails-78b0ac32591b8d25fbc67f5292ed5575cb0d9c5a.tar.bz2
rails-78b0ac32591b8d25fbc67f5292ed5575cb0d9c5a.zip
ConnectionMonitor is once again notified of disconnect
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection.coffee1
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection_monitor.coffee1
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()