worker_roulette 0.0.11 → 0.0.12

data/lib/worker_roulette/a_tradesman.rb

@@ -4,7 +4,7 @@ module WorkerRoulette
     def wait_for_work_orders(on_subscribe_callback = nil, &on_message_callback)
       @redis_pubsub ||= WorkerRoulette.new_redis_pubsub #cannot use connection pool bc redis expects each obj to own its own pubsub connection for the life of the subscription
       @redis_pubsub.on(:subscribe) {|channel, subscription_count| on_subscribe_callback.call(channel, subscription_count) if on_subscribe_callback}
-      @redis_pubsub.on(:message)   {|channel, message| work_orders! {|work_orders| on_message_callback.call(work_orders, message, channel)} if on_message_callback}
+      @redis_pubsub.on(:message)   {|channel, message| set_timer(on_message_callback); work_orders! {|work_orders| on_message_callback.call(work_orders, message, channel)} if on_message_callback}
       @redis_pubsub.subscribe(@channel)
     end
 
@@ -30,6 +30,15 @@ module WorkerRoulette
     end
 
   private
+    attr_reader :timer
+    def set_timer(on_message_callback)
+      return unless on_message_callback
+      @timer && @timer.cancel
+      @timer = EM::PeriodicTimer.new(rand(20..25)) do
+        work_orders! {|work_orders| on_message_callback.call(work_orders, nil, nil)}
+      end
+    end
+
     def self.lua_drain_work_orders
       <<-HERE
         local job_board_key     = KEYS[1]

data/lib/worker_roulette/version.rb

@@ -1,3 +1,3 @@
 module WorkerRoulette
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/integration/evented_worker_roulette_spec.rb

@@ -227,15 +227,49 @@ describe WorkerRoulette do
       EM::Hiredis::PubsubClient.any_instance.should_receive(:close_connection).and_call_original
     end
 
-    it "should periodically (random time between 10  and 15 seconds?) poll the job board for new work, in case it missed a notification"
-    it "should not delete the messages from the queue until they have been processed succcesfully"
-    it "should not cache the sender our counter keys"
-    it "should pull off work orders for more than one sender"
+    it "should periodically (random time between 20 and 25 seconds?) poll the job board for new work, in case it missed a notification" do
+      EM::PeriodicTimer.should_receive(:new) {|time| time.should be_within(2.5).of(22.5)}
+      publish = proc {foreman.enqueue_work_order('foo')}
+      subject.wait_for_work_orders(publish) {done}
+    end
+
+    xit "should cancel the old timer when the on_message callback is called" do
+      publish = proc {foreman.enqueue_work_order('foo')}
+      subject.wait_for_work_orders(publish) do
+        subject.send(:timer).should_receive(:cancel).and_call_original
+        done
+      end
+    end
+
+    it "should pull off work orders for more than one sender" do
+      tradesman         = WorkerRoulette.a_tradesman('good_channel')
+
+      good_foreman      = WorkerRoulette.a_foreman('good_foreman', 'good_channel')
+      lazy_foreman      = WorkerRoulette.a_foreman('lazy_foreman', 'good_channel')
+
+      got_good = false
+      got_lazy  = false
+      good_foreman.enqueue_work_order('do good work') do
+        tradesman.work_orders! do |r|
+          got_good = true
+          r.first['payload'].should == ('do good work')
+        end
+      end
+      lazy_foreman.enqueue_work_order('just get it done') do
+        tradesman.work_orders! do |r|
+          got_lazy = true
+          r.first['payload'].should == ('just get it done')
+        end
+      end
+
+      done(0.2) {(got_good && got_lazy).should == true}
+    end
   end
 
-  context "Read Lock" do
-    it "should checkout a readlock for a queue and put it back when its done processing; lock should expire after 5 minutes?"
-    it "should retry doing work on a queue 3 times if it is locked (ex backoff)"
+  context "Potential Ack Success/Failure for Processing Queues" do
+    xit "should not delete the messages from the queue until they have been processed succcesfully"
+    xit "should checkout a readlock for a queue and put it back when its done processing; lock should expire after 5 minutes?"
+    xit "should retry doing work on a queue 3 times if it is locked (ex backoff)"
   end
 
   context "Failure" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worker_roulette
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: