Merge branch 'feature/default-queue'

collectiveidea · Jun 5, 2012 · 0333bf1 · ngan · Aug 21, 2012 · 0333bf1
2 parents ceb6487 + 8d5052e
commit 0333bf1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/lib/delayed/backend/base.rb b/lib/delayed/backend/base.rb
@@ -9,7 +9,8 @@ module ClassMethods
         # Add a job to the queue
         def enqueue(*args)
           options = {
-            :priority => Delayed::Worker.default_priority
+            :priority => Delayed::Worker.default_priority,
+            :queue => Delayed::Worker.default_queue_name
           }.merge!(args.extract_options!)
 
           options[:payload_object] ||= args.shift

diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb
@@ -20,6 +20,9 @@ class Worker
       :default_priority, :sleep_delay, :logger, :delay_jobs, :queues,
       :read_ahead, :plugins, :destroy_failed_jobs
 
+    # Named queue into which jobs are enqueued by default
+    cattr_accessor :default_queue_name
+
     cattr_reader :backend
 
     # name_prefix is ignored if name is set directly

diff --git a/spec/message_sending_spec.rb b/spec/message_sending_spec.rb
@@ -83,6 +83,13 @@ def tell
       Delayed::Worker.default_priority = 0
     end
 
+    it "should set default queue name" do
+      Delayed::Worker.default_queue_name = 'abbazabba'
+      job = FairyTail.delay.to_s
+      job.queue.should == 'abbazabba'
+      Delayed::Worker.default_queue_name = nil
+    end
+
     it "should set job options" do
       run_at = Time.parse('2010-05-03 12:55 AM')
       job = FairyTail.delay(:priority => 20, :run_at => run_at).to_s