resque_stuck_queue 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: cfbe93e242cdb25b7d6783cbe4fe4ae43f3e55c0
-  metadata.gz: a1e36f35d1b8e95afb3102b67bc1e28234d2bd4f
 SHA512: 
-  data.tar.gz: b3ff34bf049f1ffd625da524797ee7a7405cd63c0b93da7c5bbc14a921b0326ce9a22d1475d399cf612fe75f807cdd646166af9a2ca7126f6150dcd6913cd7a0
-  metadata.gz: d77c76164663b195c3e686104354109290360ba2deb8fa4f9f91cbd4634747e17f09e12ac24fb845ad310a307b1f5ffbd7bc68f089b87966781ef954981adce0
+  data.tar.gz: 2055181649b94897f6bfc18817199a35bf9a0324042da9a6ed15653bea22d459a7e5ba062ec57294c557d0ed2ab04df418bdce4b01f53e39ecae6771e7a39e16
+  metadata.gz: 3fe6ae6af383d55311d5075d85b86b73fe2955c3f7149ab23c5e0adf61a999b4fdd706951efc3e39594786c0f4c20e3208c4037f9e705fe97ac301e4f04edca4
+SHA1: 
+  data.tar.gz: 3a99f92f2847757bb1db57e7c62bc80bc430f2c4
+  metadata.gz: 940d63172246826ea3fbf12d883ecf44a5f76e53

data/Rakefile

@@ -17,6 +17,8 @@ task :'resque:setup' do
   # https://github.com/resque/resque/issues/773
   # have the jobs loaded in memory
   Dir["./test/resque/*.rb"].each {|file| require file}
+  # load project
+  Dir["./lib/resque_stuck_queue.rb"].each {|file| require file}
 end
 
 require 'resque_scheduler/tasks'

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 )
           end
         end
       end

data/lib/resque_stuck_queue/heartbeat_job.rb

@@ -6,9 +6,10 @@ module Resque
         attr_accessor :redis
 
         def perform(*args)
-          keyname,host,port,namespace = args
+          keyname,host,port,namespace = *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}"
         end
 
       end

data/lib/resque_stuck_queue/version.rb

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

data/test/test_helper.rb

@@ -13,7 +13,7 @@ module TestHelper
   extend self
 
   def run_resque(queue_name = "*")
-    pid = fork { exec("export QUEUE=#{queue_name}; bundle exec rake --trace resque:work") }
+    pid = fork { exec("export INTERVAL=1 QUEUE=#{queue_name}; bundle exec rake --trace resque:work") }
     sleep 3 # wait for resque to boot up
     pid
   end

data/test/test_integration.rb

@@ -55,6 +55,7 @@ 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
@@ -62,9 +63,8 @@ class TestIntegration < Minitest::Test
     start_and_stop_loops_after(5)
     Resque::StuckQueue.redis.del(SetRedisKey::NAME)
     Resque.enqueue_to(:app, SetRedisKey)
-    sleep 3
-    #assert_equal Resque::StuckQueue.redis.get(SetRedisKey::NAME), "1" # transient failure: resque picks up jobs at unpredectiple times?
-    # job ran successfully, so don't trigger
+    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
   end
 
@@ -85,6 +85,7 @@ class TestIntegration < Minitest::Test
 
     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)) }

metadata

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