Subscribe and unsubscribe from the internal redis channels in the primary EM thread

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/action_cable/connection/internal_channel.rb b/lib/action_cable/connection/internal_channel.rb
index b00e21824c..c065a24ab7 100644
--- a/lib/action_cable/connection/internal_channel.rb
+++ b/lib/action_cable/connection/internal_channel.rb
@@ -15,14 +15,14 @@ module ActionCable
             @_internal_redis_subscriptions ||= []
             @_internal_redis_subscriptions << [ internal_redis_channel, callback ]
 
-            pubsub.subscribe(internal_redis_channel, &callback)
+            EM.next_tick { pubsub.subscribe(internal_redis_channel, &callback) }
             logger.info "Registered connection (#{connection_identifier})"
           end
         end
 
         def unsubscribe_from_internal_channel
           if @_internal_redis_subscriptions.present?
-            @_internal_redis_subscriptions.each { |channel, callback| pubsub.unsubscribe_proc(channel, callback) }
+            @_internal_redis_subscriptions.each { |channel, callback| EM.next_tick { pubsub.unsubscribe_proc(channel, callback) } }
           end
         end