Periodic timers: delegate async instance_exec to the worker pool

2 files changed, 9 insertions, 7 deletions

diff --git a/actioncable/lib/action_cable/channel/periodic_timers.rb b/actioncable/lib/action_cable/channel/periodic_timers.rb
index dab604440f..41511312fc 100644
--- a/actioncable/lib/action_cable/channel/periodic_timers.rb
+++ b/actioncable/lib/action_cable/channel/periodic_timers.rb
@@ -64,9 +64,7 @@ module ActionCable
 
         def start_periodic_timer(callback, every:)
           connection.server.event_loop.timer every do
-            connection.worker_pool.async_invoke connection do
-              instance_exec(&callback)
-            end
+            connection.worker_pool.async_exec self, connection: connection, &callback
           end
         end
 
diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb
index a638ff72e7..f3a4fc5a5b 100644
--- a/actioncable/lib/action_cable/server/worker.rb
+++ b/actioncable/lib/action_cable/server/worker.rb
@@ -42,16 +42,20 @@ module ActionCable
         self.connection = nil
       end
 
-      def async_invoke(receiver, method, *args, connection: receiver)
+      def async_exec(receiver, *args, connection:, &block)
+        async_invoke receiver, :instance_exec, *args, connection: connection, &block
+      end
+
+      def async_invoke(receiver, method, *args, connection: receiver, &block)
         @executor.post do
-          invoke(receiver, method, *args, connection: connection)
+          invoke(receiver, method, *args, connection: connection, &block)
         end
       end
 
-      def invoke(receiver, method, *args, connection:)
+      def invoke(receiver, method, *args, connection:, &block)
         work(connection) do
           begin
-            receiver.send method, *args
+            receiver.send method, *args, &block
           rescue Exception => e
             logger.error "There was an exception - #{e.class}(#{e.message})"
             logger.error e.backtrace.join("\n")