resque_stuck_queue 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 984e71835c73d5f071caca892a28cb91ac6efb8f
-  metadata.gz: 0f1326d639f3e02c6710b18bb4ba16f25edd30f9
 SHA512: 
-  data.tar.gz: c21a0aab9167fc5dbf9e9d95f7625165bc306df82f509db512198eefc79cf51a1801a65af658239b44d5959a52ad68406a4527bd14a4b953d4816b2f9eb59f05
-  metadata.gz: 7f5674fd8a47fd21f08ba0114aa6f8fde2fb75e0237fa8e9cce5d1462b5cb8be9dcf8427d05c9cb19499a55835d52733c82849e7b60323b06b5d5bacfd05026d
+  metadata.gz: df4e25ba257df91726f7c92cfe1a92f1a04b2afecb0106a4a80d0da12b494c67672fd5c40a981c813b4e18ede7d18b5e2aba3c8a445692e910acc17b9adc360e
+  data.tar.gz: 22f4307be4f19c7e3b138c4d18013ac8fefc3a7a4d53a4071c6a6f8c1f32ec9dce2f187db9476e12d4f871a332ba6d9842fd6eb6d2ac6bf576dad79522eae783
+SHA1: 
+  metadata.gz: ff579897e68c118a67fe037962f318c2a265e851
+  data.tar.gz: a82bad8bbf4ce498aac49d8b1f54c42047ee6b15

data/README.md

@@ -36,7 +36,7 @@ Resque::StuckQueue.config[:trigger_timeout] = 10.hours
 #
 # triggering will update the key, so you'll have to wait the trigger_timeout again
 # in order for it to trigger again even if workers are still stale.
-Resque::StuckQueue.config[:handler] = proc { send_email }
+Resque::StuckQueue.config[:handler] = proc { |queue_name| send_email("queue #{queue_name} isnt working, aaah the daemons") }
 
 # optional, in case you want to set your own name for the key that will be used as the last good hearbeat time
 # note this will be namespaced under the specific queue it's monitoring, for eg "app:name-the-refresh-key-as-you-please"
@@ -94,7 +94,7 @@ namespace :resque do
 
     Resque::StuckQueue.config[:heartbeat] = 10.minutes
     Resque::StuckQueue.config[:trigger_timeout] = 1.hour
-    Resque::StuckQueue.config[:handler] = proc { $stderr.puts("resque wonky!") }
+    Resque::StuckQueue.config[:handler] = proc { |queue_name| $stderr.puts("resque queue #{queue_name} wonky!") }
 
     Resque::StuckQueue.start # blocking operation, daemon running
   end
@@ -133,3 +133,4 @@ Resque::StuckQueue.config[:refresh_job] = proc {
 Run the tests:
 
 `bundle; bundle exec rake`
+`RESQUE_2=1 bundle exec rake # for resq 2 compat`

data/lib/resque_stuck_queue.rb

@@ -14,7 +14,7 @@ module Resque
     GLOBAL_KEY        = "resque-stuck-queue"
     HEARTBEAT         = 60 * 60 # check/refresh every hour
     TRIGGER_TIMEOUT   = 5 * 60 * 60 # warn/trigger 5 hours
-    HANDLER           = proc { $stdout.puts("Shit gone bad with them queues.") }
+    HANDLER           = proc { |queue_name| $stdout.puts("Shit gone bad with them queues...on #{queue_name}.") }
 
     class << self
 
@@ -34,7 +34,7 @@ module Resque
       # :abort_on_exception 
       #
       # # default handler
-      # config[:handler] = proc { send_mail }
+      # config[:handler] = proc { |queue_name| send_mail }
       #
       # # explicit redis
       # config[:redis] = Redis.new
@@ -50,6 +50,12 @@ module Resque
         @redis ||= (config[:redis] || Resque.redis)
       end
 
+      def redis=(rds)
+        # for resq2 tests
+        @redis = rds
+        Resque.redis = @redis
+      end
+
       def global_key_for(under_queue)
         "#{under_queue}:#{config[:global_key] || GLOBAL_KEY}"
       end
@@ -181,7 +187,7 @@ module Resque
       end
 
       def trigger_handler(queue_name)
-        (config[:handler] || HANDLER).call
+        (config[:handler] || HANDLER).call(queue_name)
         manual_refresh(queue_name)
       rescue => e
         logger.info("handler for #{queue_name} crashed: #{e.inspect}")

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/test/resque/set_redis_key.rb

@@ -3,6 +3,7 @@ class SetRedisKey
   NAME = "integration_test"
   @queue = :app
   def self.perform
-    Resque.redis.set(NAME, "1")
+    # tests run on localhost
+    Redis.new.set(NAME, "1")
   end
 end

data/test/test_collision.rb

@@ -5,18 +5,19 @@ class TestCollision < Minitest::Test
   include TestHelper
 
   def setup
-    Resque.redis.flushall
+    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.redis.flushall
   end
 
   def test_two_processes_interacting
     puts "#{__method__}"
     # no resque should be running here so timeouts will be reached + trigger
-    Resque.redis.del("test-incr-key")
+    Resque::StuckQueue.redis.del("test-incr-key")
 
-    p1 = fork { Resque.redis.client.reconnect; run_resque_stuck_daemon;  }
-    p2 = fork { Resque.redis.client.reconnect; run_resque_stuck_daemon;  }
-    p3 = fork { Resque.redis.client.reconnect; run_resque_stuck_daemon;  }
-    p4 = fork { Resque.redis.client.reconnect; run_resque_stuck_daemon;  }
+    p1 = fork { Resque::StuckQueue.redis.client.reconnect; run_resque_stuck_daemon;  }
+    p2 = fork { Resque::StuckQueue.redis.client.reconnect; run_resque_stuck_daemon;  }
+    p3 = fork { Resque::StuckQueue.redis.client.reconnect; run_resque_stuck_daemon;  }
+    p4 = fork { Resque::StuckQueue.redis.client.reconnect; run_resque_stuck_daemon;  }
 
     Thread.new {
       sleep 5 # let test run and trigger once occur (according to time below)
@@ -29,7 +30,7 @@ class TestCollision < Minitest::Test
 
     Process.waitall
 
-    assert_equal 1, Resque.redis.get("test-incr-key").to_i
+    assert_equal 1, Resque::StuckQueue.redis.get("test-incr-key").to_i
   end
 
   private
@@ -38,7 +39,7 @@ class TestCollision < Minitest::Test
     Resque::StuckQueue.config[:heartbeat] = 1
     Resque::StuckQueue.config[:abort_on_exception] = true
     Resque::StuckQueue.config[:trigger_timeout] = 3
-    Resque::StuckQueue.config[:handler] = proc { Resque.redis.incr("test-incr-key") }
+    Resque::StuckQueue.config[:handler] = proc { Resque::StuckQueue.redis.incr("test-incr-key") }
     Resque::StuckQueue.start
   end
 

data/test/test_integration.rb

@@ -25,11 +25,14 @@ class TestIntegration < Minitest::Test
   # ps aux |grep resqu |awk '{print $2}' | xargs kill
 
   def setup
+    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.redis.flushall
+    Resque::StuckQueue.config[:abort_on_exception] = true
   end
 
   def teardown
    `kill -9 #{@resque_pid}` # CONT falls throughs sometimes? hax, rm this and SIGSTOP/SIGCONT
-    Resque::StuckQueue.stop
+    Resque::StuckQueue.force_stop!
     Process.waitpid(@resque_pid)
   end
 
@@ -43,10 +46,10 @@ class TestIntegration < Minitest::Test
 
     # job gets enqueued successfully
     @resque_pid = run_resque
-    Resque.redis.del(SetRedisKey::NAME)
-    Resque.enqueue(SetRedisKey)
+    Resque::StuckQueue.redis.del(SetRedisKey::NAME)
+    Resque.enqueue_to(:app, SetRedisKey)
     sleep 6 # let resque pick up the job
-    assert_equal Resque.redis.get(SetRedisKey::NAME), "1"
+    assert_equal Resque::StuckQueue.redis.get(SetRedisKey::NAME), "1" # job ran
 
     # check handler did not get called
     assert_equal @triggered, false
@@ -62,10 +65,10 @@ class TestIntegration < Minitest::Test
 
     # job gets enqueued successfully
     @resque_pid = run_resque
-    Resque.redis.del(SetRedisKey::NAME)
+    Resque::StuckQueue.redis.del(SetRedisKey::NAME)
     Process.kill("SIGSTOP", @resque_pid) # jic, do not process jobs so we definitely trigger
     Resque.enqueue(SetRedisKey)
-    assert_equal Resque.redis.get(SetRedisKey::NAME), nil
+    assert_equal Resque::StuckQueue.redis.get(SetRedisKey::NAME), nil
     sleep 2 # allow timeout to trigger
 
     # check handler did get called

data/test/test_named_queues.rb

@@ -8,12 +8,13 @@ class TestNamedQueues < Minitest::Test
     Resque::StuckQueue.config[:trigger_timeout] = 1
     Resque::StuckQueue.config[:heartbeat] = 1
     Resque::StuckQueue.config[:abort_on_exception] = true
-    Resque.redis.flushall
+    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.redis.flushall
   end
 
   def teardown
    `kill -9 #{@resque_pid}` if @resque_pid
-    Resque::StuckQueue.stop
+    Resque::StuckQueue.force_stop!
     Process.waitpid(@resque_pid) if @resque_pid
   end
 
@@ -35,8 +36,9 @@ class TestNamedQueues < Minitest::Test
     puts "#{__method__}"
     Resque::StuckQueue.config[:trigger_timeout] = 2 # won't allow waiting too much and will complain (eg trigger) sooner than later
     Resque::StuckQueue.config[:heartbeat] = 1
+    Resque::StuckQueue.config[:queues] = [:custom_queue_name]
     @triggered = false
-    Resque::StuckQueue.config[:handler] = proc { @triggered = true }
+    Resque::StuckQueue.config[:handler] = proc { |queue_name| @triggered = queue_name }
     Resque::StuckQueue.start_in_background
 
     # job gets enqueued successfully
@@ -44,7 +46,7 @@ class TestNamedQueues < Minitest::Test
     sleep 2 # allow timeout to trigger
 
     # check handler did get called
-    assert_equal @triggered, true
+    assert_equal @triggered, :custom_queue_name
   end
 
   def test_resque_enqueues_a_job_correct_queue_does_not_trigger

data/test/test_resque_2.rb

@@ -16,12 +16,13 @@ if !ENV['RESQUE_2'].nil?
 
     def setup
       assert (Resque::VERSION.match /^2\./), "must run in 2.0"
+    Resque::StuckQueue.redis = Redis.new
       Redis.new.flushall
     end
 
    def test_works_with_2_point_oh_do_not_trigger_because_key_is_updated
 
-     Resque.redis = Redis.new
+     Resque::StuckQueue.redis = Redis.new
 
      Resque::StuckQueue.config[:heartbeat] = 1
      Resque::StuckQueue.config[:abort_on_exception] = true
@@ -33,7 +34,7 @@ if !ENV['RESQUE_2'].nil?
      #binding.pry
      Resque::StuckQueue.start_in_background
 
-     @r2_pid = fork { Resque.redis = Redis.new ; Resque::Worker.new("*", :graceful_term => true).work ; Process.waitall }
+     @r2_pid = fork { Resque::StuckQueue.redis = Redis.new ; Resque::Worker.new("*", :graceful_term => true).work ; Process.waitall }
      sleep 10
 
      # did not trigger, resque picked up refresh jobs

data/test/test_resque_stuck_queue.rb

@@ -13,17 +13,18 @@ class TestResqueStuckQueue < Minitest::Test
   def setup
     puts "#{__method__}"
     # clean previous test runs
-    Resque.redis.flushall
+    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.redis.flushall
     Resque::StuckQueue.config[:heartbeat]   = 1 # seconds
     Resque::StuckQueue.config[:abort_on_exception] = true
   end
 
   def test_configure_global_key
     puts "#{__method__}"
-    assert_nil Resque.redis.get("it-is-configurable"), "global key should not be set"
+    assert_nil Resque::StuckQueue.redis.get("it-is-configurable"), "global key should not be set"
     Resque::StuckQueue.config[:global_key] = "it-is-configurable"
     start_and_stop_loops_after(2)
-    refute_nil Resque.redis.get("app:it-is-configurable"), "global key should be set"
+    refute_nil Resque::StuckQueue.redis.get("app:it-is-configurable"), "global key should be set"
   end
 
   def test_it_does_not_trigger_handler_if_under_max_time

data/test/test_set_custom_refresh_job.rb

@@ -9,7 +9,8 @@ class TestYourOwnRefreshJob < Minitest::Test
     Resque::StuckQueue.config[:heartbeat] = 1
     Resque::StuckQueue.config[:abort_on_exception] = true
     Resque::StuckQueue.config[:refresh_job] = nil
-    Resque.redis.flushall
+    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.redis.flushall
   end
 
   def teardown

metadata

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