resque-serial-queues 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd531373558ed3d2a84f9e421a3233c9ab905d1f
-  data.tar.gz: 9de3eb0f08eb657bd08c24aea3631e63da08373c
+  metadata.gz: e19304f340b143c7376d8cc03dd7d81bec8b74c3
+  data.tar.gz: 86ed33dcccfcafb040c117666699765858190960
 SHA512:
-  metadata.gz: 8fff5b737059347db4d065cfcdc542199a7bde5cd41b3debecadaa1b115de2ce2f1d7080dc3558a87730fde750ff94012b39d5d41e5d9d51740988045e0955be
-  data.tar.gz: cfc9029142c28796b5b500a533eaaf06eb39ee659517724daddd4edbee16d47cdfd024b2b36c502f5d7e5911b762bd0ee04057b6702bcf2781c9cac1d63eb693
+  metadata.gz: d668ba3a3707d79e788f555a996e04e89ca3c5529062e8be643d0315d658bbe5cbc811b69d7c64c083e2ca8df2bae9388368fbd05d755940c9ac60a14fa9e904
+  data.tar.gz: 0a57e248988a019a1f717a06eae19c1b29f32da4ac70a60bba38da0da0446423c110045fd63967f448a05c2d38f21e381ba7723ff53d7ea659f210b3682d6509

data/lib/resque-serial-queues/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module SerialQueues
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/lib/resque/plugins/serial_queues.rb

@@ -17,6 +17,10 @@ module Resque
         config.serial_queues.include?(queue.to_s)
       end
 
+      def self.is_queue_locked?(queue)
+        redis.exists("queue-lock:#{queue}")
+      end
+
       def self.lock_queue(queue)
         if redis.setnx("queue-lock:#{queue}", 1)
           redis.expire("queue-lock:#{queue}", config.lock_timeout)
@@ -26,10 +30,6 @@ module Resque
         end
       end
 
-      def self.is_queue_locked?(queue)
-        redis.exists("queue-lock:#{queue}")
-      end
-
       def self.unlock_queue(queue)
         redis.del("queue-lock:#{queue}")
       end

data/lib/resque/plugins/serial_queues/resque_extension.rb

@@ -3,10 +3,18 @@ require 'resque/job'
 
 class Resque::Job
   def self.reserve(queue)
+    return if queue=="*"
     return if is_serial_queue?(queue) and is_queue_locked?(queue)
-    return unless payload = Resque.pop(queue)
-    lock_queue(queue)
-    new(queue, payload)
+    return if is_serial_queue?(queue) and Resque.peek(queue) and not lock_queue(queue)
+    if payload = Resque.pop(queue)
+      new(queue, payload)
+    else
+      unlock_queue(queue)
+      nil
+    end
+  rescue Exception => e
+    unlock_queue(queue)
+    nil
   end
 
   protected
@@ -21,6 +29,10 @@ class Resque::Job
     def self.lock_queue(queue)
       Resque::Plugins::SerialQueues.lock_queue(queue)
     end
+
+    def self.unlock_queue(queue)
+      Resque::Plugins::SerialQueues.unlock_queue(queue)
+    end
 end
 
 class Object

data/test/cases/locking_test.rb

@@ -39,37 +39,34 @@ class LockingTest < ResqueSerialQueuesTest
   def test_a_queue_is_not_locked_after_running
     self.class.start_redis_workers 1
     Resque.enqueue SleepingJob, 0.1
-    sleep 0.4
+    sleep 1
     assert_queue_unlocked :serial_jobs
   end
 
   def test_a_queue_is_not_locked_after_a_job_fails
     self.class.start_redis_workers 1
     Resque.enqueue DelayedFailingJob, 0.1
-    sleep 0.4
+    sleep 1
     assert_queue_unlocked :serial_jobs
   end
 
   def test_running_many_concurrent_jobs
-    jobs = 10
-    max_sleep = 0.05
-    workers = 2
+    jobs = 5000
+    max_sleep = 0.5
+    workers = 5
     self.class.start_redis_workers workers
     jobs.times do
       Resque.enqueue BenchmarkJob, max_sleep
     end
-    assert_queue_locked :serial_jobs
     while Resque.info[:pending]>0
-      sleep 0.1
-      assert Resque.info[:working]<=1, "Should not have more than one working worker"
+      sleep 1
     end
-    assert_queue_unlocked :serial_jobs
     results = []
     while row = Resque::Plugins::SerialQueues.redis.lpop("benchmark-results")
       results << row.split("-").map(&:to_f)
     end
     results.flatten!
-    assert_equal results, results.sort
+    assert_equal results, results.sort, "Workers times seems to overlap"
   end
 
 end

data/test/minitest_helper.rb

@@ -70,14 +70,23 @@ class ResqueSerialQueuesTest < Minitest::Test
           raise "Failed to start worker"
         end
       else
-        Resque.redis.client.reconnect
-        worker = Resque::Worker.new("*")
-        worker.term_timeout = 4.0
-        worker.term_child = true
-        Resque.logger.level = Logger::DEBUG
-        log "Worker started working"
-        worker.work 0.1
-        Kernel.exit!
+        begin
+          Resque.redis.client.reconnect
+          # we need to prevent against querying for jobs in "*"
+          Resque.watch_queue :test_queue
+          # Resque.logger = MonoLogger.new(File.open(File.expand_path('../../log', __FILE__) << "/resque-#{Process.pid}.log", "w+"))
+          # Resque.logger.level = Logger::DEBUG
+          # Resque.logger.formatter = Resque::VerboseFormatter.new
+          worker = Resque::Worker.new("*")
+          worker.term_timeout = 4.0
+          worker.term_child = true
+          log "Worker will start working"
+          worker.work 0.1
+          Kernel.exit!
+        rescue Exception => e
+          log "Failed to start worker: #{e.inspect}"
+          Kernel.exit!
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-serial-queues
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cristian Bica