3 files changed, 11 insertions, 6 deletions
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec
index 137fa64431..31c6fb41f2 100644
--- a/actioncable/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
     "changelog_uri"   => "https://github.com/rails/rails/blob/v#{version}/actioncable/CHANGELOG.md"
   }
 
+  # NOTE: Please read our dependency guidelines before updating versions:
+  # https://edgeguides.rubyonrails.org/security.html#dependency-management-and-cves
+
   s.add_dependency "actionpack", version
 
   s.add_dependency "nio4r",            "~> 2.0"
diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js
index df60b1fc24..07151b9d25 100644
--- a/actioncable/app/assets/javascripts/action_cable.js
+++ b/actioncable/app/assets/javascripts/action_cable.js
@@ -238,8 +238,8 @@
       }, this.getPollInterval());
     };
     ConnectionMonitor.prototype.getPollInterval = function getPollInterval() {
-      var _constructor$pollInte = this.constructor.pollInterval, min = _constructor$pollInte.min, max = _constructor$pollInte.max;
-      var interval = 5 * Math.log(this.reconnectAttempts + 1);
+      var _constructor$pollInte = this.constructor.pollInterval, min = _constructor$pollInte.min, max = _constructor$pollInte.max, multiplier = _constructor$pollInte.multiplier;
+      var interval = multiplier * Math.log(this.reconnectAttempts + 1);
       return Math.round(clamp(interval, min, max) * 1e3);
     };
     ConnectionMonitor.prototype.reconnectIfStale = function reconnectIfStale() {
@@ -275,7 +275,8 @@
   }();
   ConnectionMonitor.pollInterval = {
     min: 3,
-    max: 30
+    max: 30,
+    multiplier: 5
   };
   ConnectionMonitor.staleThreshold = 6;
   var Consumer = function() {
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)