1 files changed, 14 insertions, 8 deletions
diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb
index a638ff72e7..c69cc4ac31 100644
--- a/actioncable/lib/action_cable/server/worker.rb
+++ b/actioncable/lib/action_cable/server/worker.rb
@@ -1,6 +1,8 @@
-require 'active_support/callbacks'
-require 'active_support/core_ext/module/attribute_accessors_per_thread'
-require 'concurrent'
+# frozen_string_literal: true
+
+require "active_support/callbacks"
+require "active_support/core_ext/module/attribute_accessors_per_thread"
+require "concurrent"
 
 module ActionCable
   module Server
@@ -25,7 +27,7 @@ module ActionCable
       # Stop processing work: any work that has not already started
       # running will be discarded from the queue
       def halt
-        @executor.kill
+        @executor.shutdown
       end
 
       def stopping?
@@ -42,16 +44,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")