aboutsummaryrefslogtreecommitdiffstats
path: root/lib/assets
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-03-24 12:35:39 -0500
committerPratik Naik <pratiknaik@gmail.com>2015-03-24 12:35:39 -0500
commitc4d81c97b925e59f39ef2dcd54998d52a655ab0d (patch)
tree45e2b1376633596ad000dc10c6ea61ed850240d0 /lib/assets
parent7191b038d829a1b5ae917ebb9298091c41f065b0 (diff)
parent63d61051aaf62fdc956d3fe11b380033e09a76fe (diff)
downloadrails-c4d81c97b925e59f39ef2dcd54998d52a655ab0d.tar.gz
rails-c4d81c97b925e59f39ef2dcd54998d52a655ab0d.tar.bz2
rails-c4d81c97b925e59f39ef2dcd54998d52a655ab0d.zip
Merge branch 'master' into authorization
Diffstat (limited to 'lib/assets')
-rw-r--r--lib/assets/javascripts/cable.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/assets/javascripts/cable.js.coffee b/lib/assets/javascripts/cable.js.coffee
index fff64cd284..46cbf7bff0 100644
--- a/lib/assets/javascripts/cable.js.coffee
+++ b/lib/assets/javascripts/cable.js.coffee
@@ -3,7 +3,7 @@
class @Cable
MAX_CONNECTION_INTERVAL: 5 * 1000
- PING_STALE_INTERVAL: 6
+ PING_STALE_INTERVAL: 8
constructor: (@cableUrl) ->
@subscribers = {}
@@ -80,7 +80,7 @@ class @Cable
@waitForPingTimeout = setTimeout =>
console.log "Ping took too long to arrive. Reconnecting.."
- @connection?.close()
+ @reconnect()
, @PING_STALE_INTERVAL * 1000
clearPingWaitTimeout: =>