Dynamically get default queue name from Reactor module

cloud66 · Dec 5, 2023 · 5a29fa0 · 5a29fa0
1 parent bb4939a
commit 5a29fa0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/reactor/event.rb b/lib/reactor/event.rb
@@ -70,9 +70,9 @@ def publish(name, data = {})
       Reactor.validator.call(message)
       message_data = message.__data__.to_hash
       if message.at
-        perform_at message.at, name, message_data
+        event_queue.perform_at(message.at, name, message_data)
       else
-        perform_async name, message_data
+        event_queue.perform_async(name, message_data)
       end
     end
 
@@ -99,6 +99,14 @@ def reschedule(name, data = {})
 
       publish(name, data.except([:was, :if])) if data[:at].try(:future?)
     end
+
+    private
+
+    def event_queue
+      queue_override = ENV['REACTOR_QUEUE']
+      queue_override ||= ::Reactor.default_queue
+      queue_override.present? ? set(queue: queue_override) : self
+    end
   end
 
   private

diff --git a/lib/reactor/workers/concerns/configuration.rb b/lib/reactor/workers/concerns/configuration.rb
@@ -29,6 +29,7 @@ def perform_where_needed(data)
 
         def event_queue
           queue_override = ENV['REACTOR_QUEUE']
+          queue_override ||= ::Reactor.default_queue
           queue_override.present? ? set(queue: queue_override) : self
         end
       end
@@ -62,4 +63,4 @@ def raise_unconfigured!
       end
     end
   end
-end
+end