From a4c27588d5a1e6f270df42b7a305f03a9aee54f2 Mon Sep 17 00:00:00 2001 From: Richard Macklin Date: Fri, 16 Nov 2018 20:00:45 -0800 Subject: Synchronize ActionCable JS source code with compiled bundle 30a0c7e04093add0b14be6da17c7496e7dd40e10 commited changes to the compiled bundle but not to the corresponding source files. This meant that running `yarn build` was producing untracked changes to the compiled bundle. The fix is to commit the changes to the source files so that they are in sync. --- actioncable/app/javascript/action_cable/connection_monitor.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actioncable/app') diff --git a/actioncable/app/javascript/action_cable/connection_monitor.js b/actioncable/app/javascript/action_cable/connection_monitor.js index 8d6ac1f682..cd1e4602d8 100644 --- a/actioncable/app/javascript/action_cable/connection_monitor.js +++ b/actioncable/app/javascript/action_cable/connection_monitor.js @@ -75,8 +75,8 @@ class ConnectionMonitor { } getPollInterval() { - const {min, max} = this.constructor.pollInterval - const interval = 5 * Math.log(this.reconnectAttempts + 1) + const {min, max, multiplier} = this.constructor.pollInterval + const interval = multiplier * Math.log(this.reconnectAttempts + 1) return Math.round(clamp(interval, min, max) * 1000) } @@ -117,7 +117,8 @@ class ConnectionMonitor { ConnectionMonitor.pollInterval = { min: 3, - max: 30 + max: 30, + multiplier: 5 } ConnectionMonitor.staleThreshold = 6 // Server::Connections::BEAT_INTERVAL * 2 (missed two pings) -- cgit v1.2.3