Ping pubsub every 2 minutes

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index 930deec1d7..f7399666bc 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -1,5 +1,7 @@
 module ActionCable
   class Server
+    PUBSUB_PING_TIMEOUT = 120
+
     cattr_accessor(:logger, instance_reader: true) { Rails.logger }
 
     attr_accessor :registered_channels, :redis_config
@@ -24,7 +26,7 @@ module ActionCable
     end
 
     def pubsub
-      @pubsub ||= redis.pubsub
+      @pubsub ||= redis.pubsub.tap { |pb| add_pubsub_periodic_timer(pb) }
     end
 
     def redis
@@ -71,5 +73,12 @@ module ActionCable
       @connections.map(&:statistics)
     end
 
+    protected
+      def add_pubsub_periodic_timer(ps)
+        @pubsub_periodic_timer ||= EventMachine.add_periodic_timer(PUBSUB_PING_TIMEOUT) do
+          logger.info "[ActionCable] Pubsub ping"
+          ps.ping
+        end
+      end
   end
 end