resque_stuck_queue 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2RiMWFkM2ZmMGJmOWI1YzcwYzg5MWUyNjU3MTEzNWQwYmZiOWQ1YQ==
+    MWE1YzA3NjU4NjE1NGQ3ZjQ4OGMwNzRlZDE3Nzk4ZDhlOTc2YjM4YQ==
   data.tar.gz: !binary |-
-    NjQ2ODNlOTNmMDMzZWU1MDU2NWE1NTc4YmQ1NzAwOGFlYzNlOTU5Nw==
+    YTBiNGVhN2U5ZjYzMzkwOWJkNDc4Y2ViZTcyOTFjOWNlMjJmZDdiNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mzc4ZTI4NjM2ZjlhY2ExNDM3NDhmMjU1NTA0ODE2Y2I3MzkwYzMxNDE3NTNk
-    YThjNjQ2ZDhkZjY5Nzk2YzAwMWZhZjgxOWNjMThiYzFhNGJlZWVjZjMzY2Rj
-    ZTZjZThlOGQyMzMwMzFlZmE1NTFmNDE4NzY4NmQ3ZTU1MDAwNDI=
+    ZmMxMzgzYTRhM2QyNDg4YTAyYjcxMTE4Y2RmYmNhMWJjNTBlZGVmOGMxNWRk
+    MTYxZTEyN2MyODc1NTNiODljYWRlZWUxZDgzZGExZjM5NzFkZjAzYTU5Y2M2
+    YmQyMDc0ZGFjOTlhYWFlNTM4YzFmY2M3NTI2ZTliYjcyZTA2NzY=
   data.tar.gz: !binary |-
-    YzIzYWMxYWVkZGRiYjdhY2Y3ZDNlYzQ1NzcyYzQ2ZTcxZjM1NTE5NDgyMDU1
-    OTFkMmZjNWM5NjJiZmNkM2MyNDIyMWY5Y2Q4NTk4MDZkMTViMDY2ZDlhNDgz
-    NjQ0NGJiNzEwNDIyN2Y4NTJjZTYwODI0ZTRiYjgwYWM5OGI1MGU=
+    YWY2ODg5NGEwN2Q2ZGI3ODcyMWRmZjk5OGU3NTA0ZDgyMDkxNmQ1NzIzZTM3
+    M2ExODE3NDA4NjNiMTE0ZDE5ZDdiNWEyMDE3ZjFhNDYyZTgzYTEzNTM0M2I3
+    YWEzMjc0MjFmMDFlZGNkOTk3M2YwNWY3ZjBlZjY4MWQzMzQzOTI=

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/resque_stuck_queue.rb

@@ -46,12 +46,14 @@ module Resque
 
       def start_in_background
         Thread.new do
+          Thread.current.abort_on_exception = config[:abort_on_exception]
           self.start
         end
       end
 
       def stop_in_background
         Thread.new do
+          Thread.current.abort_on_exception = config[:abort_on_exception]
           self.start
         end
       end
@@ -63,7 +65,6 @@ module Resque
         @threads = []
         config.freeze
 
-        Thread.abort_on_exception = config[:abort_on_exception]
 
         enqueue_repeating_refresh_job
         setup_checker_thread
@@ -85,40 +86,45 @@ module Resque
       end
 
       def force_stop!
+        logger.info("Force stopping")
         @threads.map(&:kill)
         reset!
-        logger.info("Force stopped")
       end
 
       def reset!
         # clean state so we can stop and start in the same process.
         @config = config.dup #unfreeze
-        @logger = nil
         @running = false
+        @logger = nil
+      end
+
+      def stopped?
+        @stopped
       end
 
       private
 
       def enqueue_repeating_refresh_job
         @threads << Thread.new do
+          Thread.current.abort_on_exception = config[:abort_on_exception]
           logger.info("Starting heartbeat thread")
           while @running
-            wait_for_it
             # we want to go through resque jobs, because that's what we're trying to test here:
             # ensure that jobs get executed and the time is updated!
             #
             # TODO REDIS 2.0 compat
             logger.info("Sending refresh job")
             Resque.enqueue(RefreshLatestTimestamp, global_key)
+            wait_for_it
           end
         end
       end
 
       def setup_checker_thread
         @threads << Thread.new do
+          Thread.current.abort_on_exception = config[:abort_on_exception]
           logger.info("Starting checker thread")
           while @running
-            wait_for_it
             mutex = Redis::Mutex.new('resque_stuck_queue_lock', block: 0)
             if mutex.lock
               begin
@@ -130,6 +136,7 @@ module Resque
                 mutex.unlock
               end
             end
+            wait_for_it
           end
         end
       end
@@ -152,6 +159,9 @@ module Resque
       def trigger_handler
         (config[:handler] || HANDLER).call
         manual_refresh
+      rescue => e
+        logger.info("handler crashed: #{e.inspect}")
+        force_stop!
       end
 
       def read_from_redis

data/test/test_resque_stuck_queue.rb

@@ -49,5 +49,20 @@ class TestResqueStuckQueue < Minitest::Test
     assert_equal true, @triggered # "handler should be called"
   end
 
+  def test_stops_if_handler_raises
+    puts "#{__method__}"
+    Resque::StuckQueue.config[:trigger_timeout] = 1
+    last_time_too_old = Time.now.to_i - Resque::StuckQueue::TRIGGER_TIMEOUT
+    Resque::StuckQueue.stubs(:read_from_redis).returns(last_time_too_old.to_s) # enforce trigger
+    Resque::StuckQueue.config[:handler] = proc { raise "handler had bad sad!" }
+    Thread.new {
+      sleep 3 # should have triggered
+      Thread.current.abort_on_exception = true
+      assert Resque::StuckQueue.stopped?, "should stop stuck_queue if handler raises."
+    }
+    start_and_stop_loops_after(4)
+  end
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shai Rosenfeld