resque_stuck_queue 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: 2055181649b94897f6bfc18817199a35bf9a0324042da9a6ed15653bea22d459a7e5ba062ec57294c557d0ed2ab04df418bdce4b01f53e39ecae6771e7a39e16
-  metadata.gz: 3fe6ae6af383d55311d5075d85b86b73fe2955c3f7149ab23c5e0adf61a999b4fdd706951efc3e39594786c0f4c20e3208c4037f9e705fe97ac301e4f04edca4
 SHA1: 
-  data.tar.gz: 3a99f92f2847757bb1db57e7c62bc80bc430f2c4
-  metadata.gz: 940d63172246826ea3fbf12d883ecf44a5f76e53
+  data.tar.gz: 24838251cf63913fd05a55753101def684df1a4f
+  metadata.gz: 3d158d30adce28f9d8cde9ea0e26e7af7309c03a
+SHA512: 
+  data.tar.gz: 6765964aa3fd134a04682037125b45f680d9263221ca7c58d40791ad286a33fd3a3330b39ae1df51ad73f49dd480ecd8b8b990b46360205827af88d75c272122
+  metadata.gz: 2fe9d2eadd44d70d24ab2bc2fa18eae87b159f1b30372e7968b7e0c4a04fc43a069b8fe35e4b512101f37056c3535302ce02dd0d6395871aa48db129d739157c

data/lib/resque_stuck_queue/heartbeat_job.rb

@@ -6,10 +6,10 @@ module Resque
         attr_accessor :redis
 
         def perform(*args)
-          keyname,host,port,namespace = *args
+          keyname,host,port,namespace,new_time = *args
           @redis = Redis::Namespace.new(namespace, :redis => Redis.new(:host => host, :port => port))
-          @redis.set(keyname, Time.now.to_i)
-          Resque::StuckQueue.logger.info "successfully updated key #{keyname}"
+          @redis.set(keyname, new_time)
+          Resque::StuckQueue.logger.info "successfully updated key #{keyname} to #{new_time} at #{Time.now}"
         end
 
       end

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/lib/resque_stuck_queue.rb

@@ -145,7 +145,7 @@ module Resque
           queues.each do |queue_name|
             # Redis::Namespace.new support as well as Redis.new
             namespace = redis.respond_to?(:namespace) ? redis.namespace : nil
-            Resque.enqueue_to(queue_name, HeartbeatJob, heartbeat_key_for(queue_name), redis.client.host, redis.client.port, namespace )
+            Resque.enqueue_to(queue_name, HeartbeatJob, heartbeat_key_for(queue_name), redis.client.host, redis.client.port, namespace, Time.now.to_i )
           end
         end
       end

data/test/test_helper.rb

@@ -18,6 +18,12 @@ module TestHelper
     pid
   end
 
+  def with_no_resque_failures(&blk)
+    Resque::Failure.clear
+    blk.call
+    assert_nil Resque::Failure.all, "Resque hearbeat job cant fail: #{Resque::Failure.all.inspect}"
+  end
+
   def hax_kill_resque
     # ugly, FIXME how to get pid of forked forked process. run_resque pid is incorrect.
    `ps aux |grep resque |awk '{print $2}' |xargs kill`

data/test/test_integration.rb

@@ -55,49 +55,51 @@ class TestIntegration < Minitest::Test
   def test_resque_enqueues_a_job_does_not_trigger
     puts "#{__method__}"
 
-    Resque::Failure.clear
-    Resque::StuckQueue.config[:trigger_timeout] = 10
-    Resque::StuckQueue.config[:heartbeat] = 1
-    @triggered = false
-    Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
-    start_and_stop_loops_after(5)
-    Resque::StuckQueue.redis.del(SetRedisKey::NAME)
-    Resque.enqueue_to(:app, SetRedisKey)
-    sleep 3 # job ran successfully, so don't trigger
-    assert_nil Resque::Failure.all, "Resque hearbeat job cant fail: #{Resque::Failure.all.inspect}"
-    assert_equal @triggered, false
+    with_no_resque_failures do
+      Resque::StuckQueue.config[:trigger_timeout] = 10
+      Resque::StuckQueue.config[:heartbeat] = 1
+      @triggered = false
+      Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
+      start_and_stop_loops_after(5)
+      sleep 3 # job ran successfully, so don't trigger
+      assert_equal @triggered, false
+    end
   end
 
   def test_resque_does_not_enqueues_a_job_does_trigger
     puts "#{__method__}"
 
-    Resque::StuckQueue.config[:trigger_timeout] = 0
-    Resque::StuckQueue.config[:heartbeat] = 1
-    @triggered = false
-    Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
-    start_and_stop_loops_after(2)
-    # check handler did get called
-    assert_equal @triggered, true
+    with_no_resque_failures do
+      Resque::StuckQueue.config[:trigger_timeout] = 0
+      Resque::StuckQueue.config[:heartbeat] = 1
+      @triggered = false
+      Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
+      start_and_stop_loops_after(2)
+      # check handler did get called
+      assert_equal @triggered, true
+    end
   end
 
   def test_has_settable_custom_hearbeat_job
     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[:redis] = Redis::Namespace.new(nil, :redis => Redis.new)
-
-    begin
-      Resque::StuckQueue.config[:heartbeat_job] = proc { Resque.enqueue_to(:app, Resque::StuckQueue::HeartbeatJob, Resque::StuckQueue.heartbeat_key_for(:app)) }
-      @triggered = false
-      Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
-      start_and_stop_loops_after(4)
-
-      sleep 3 # allow trigger
-      assert true, "should not have raised"
-      assert @triggered, "should have triggered"
-    rescue => e
-      assert false, "should have succeeded with good refresh_job.\n #{e.inspect}"
+    with_no_resque_failures do
+      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[:redis] = Redis::Namespace.new(nil, :redis => Redis.new)
+
+      begin
+        Resque::StuckQueue.config[:heartbeat_job] = proc { Resque.enqueue_to(:app, Resque::StuckQueue::HeartbeatJob, Resque::StuckQueue.heartbeat_key_for(:app)) }
+        @triggered = false
+        Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
+        start_and_stop_loops_after(4)
+
+        sleep 3 # allow trigger
+        assert true, "should not have raised"
+        assert @triggered, "should have triggered"
+      rescue => e
+        assert false, "should have succeeded with good refresh_job.\n #{e.inspect}"
+      end
     end
   end
 

metadata

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