aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Macklin <richard.github@nrm.com>2018-11-16 20:00:45 -0800
committerRichard Macklin <richard.github@nrm.com>2018-11-16 20:00:45 -0800
commita4c27588d5a1e6f270df42b7a305f03a9aee54f2 (patch)
treee1523f5b23feadc9dde9be3f179a5db1782d1326
parentef5478d326d78d1e2b567c23b4a7c16b69dc72b2 (diff)
downloadrails-a4c27588d5a1e6f270df42b7a305f03a9aee54f2.tar.gz
rails-a4c27588d5a1e6f270df42b7a305f03a9aee54f2.tar.bz2
rails-a4c27588d5a1e6f270df42b7a305f03a9aee54f2.zip
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.
-rw-r--r--actioncable/app/javascript/action_cable/connection_monitor.js7
1 files changed, 4 insertions, 3 deletions
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)