resque_stuck_queue 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 24838251cf63913fd05a55753101def684df1a4f
-  metadata.gz: 3d158d30adce28f9d8cde9ea0e26e7af7309c03a
 SHA512: 
-  data.tar.gz: 6765964aa3fd134a04682037125b45f680d9263221ca7c58d40791ad286a33fd3a3330b39ae1df51ad73f49dd480ecd8b8b990b46360205827af88d75c272122
-  metadata.gz: 2fe9d2eadd44d70d24ab2bc2fa18eae87b159f1b30372e7968b7e0c4a04fc43a069b8fe35e4b512101f37056c3535302ce02dd0d6395871aa48db129d739157c
+  metadata.gz: 73fe098253c3537faa8c3f52ba8725f5bb3b61de0e3ab592cf2f6de6eedbcf2e5bc92f3c356fac8e32fe6f383104621432ac62983af8c29c72b2ba1f2d4faebb
+  data.tar.gz: 3a2e165f4e3edc91cc6086c3180250ea5970e42695e3aede09049918ba771206e905ceac6956b94a72bf925709703b5f5bc2964edd9a3bb4c266c64e65e60e14
+SHA1: 
+  metadata.gz: 9248a893ba7d98a4e4b057f19cc2592babc83993
+  data.tar.gz: 9b3208761e51d8065c9e07e9f300085693ea3b67

data/lib/resque_stuck_queue/heartbeat_job.rb

@@ -8,8 +8,9 @@ module Resque
         def perform(*args)
           keyname,host,port,namespace,new_time = *args
           @redis = Redis::Namespace.new(namespace, :redis => Redis.new(:host => host, :port => port))
+          #raise "#{@redis.inspect} must be the same as #{Resque::StuckQueue.redis.inspect}"
           @redis.set(keyname, new_time)
-          Resque::StuckQueue.logger.info "successfully updated key #{keyname} to #{new_time} at #{Time.now}"
+          Resque::StuckQueue.logger.info "successfully updated key #{keyname} to #{new_time} at #{Time.now} for #{@redis.inspect}"
         end
 
       end

data/lib/resque_stuck_queue/version.rb

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

data/lib/resque_stuck_queue.rb

@@ -77,6 +77,8 @@ module Resque
 
         Redis::Classy.db = redis if Redis::Classy.db.nil?
 
+        pretty_process_name
+
         setup_heartbeat_thread
         setup_watcher_thread
 
@@ -180,6 +182,7 @@ module Resque
         if time_set
           time_set
         else
+          logger.info("manually refreshing #{queue_name} for :first_time")
           manual_refresh(queue_name, :first_time)
          end.to_i
       end
@@ -266,6 +269,11 @@ module Resque
       def max_wait_time
         config[:trigger_timeout] || TRIGGER_TIMEOUT
       end
+
+      def pretty_process_name
+        $0 = "rake --trace resque:stuck_queue #{redis.inspect} QUEUES=#{queues.join(",")}"
+      end
+
     end
   end
 end

data/test/test_helper.rb

@@ -26,7 +26,7 @@ module TestHelper
 
   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`
+   `ps aux |grep resque | grep -v stuck_queue |awk '{print $2}' |xargs kill`
    sleep 2 # wait for shutdown
   end
 
@@ -38,3 +38,13 @@ module TestHelper
   end
 
 end
+
+# http://stackoverflow.com/questions/9346101/how-to-get-stack-trace-from-a-testunittestcase
+def MiniTest.filter_backtrace(bt)
+  bt
+end
+
+# hax ensure previous test runs that raised didn't leave a resque process runing beforehand
+unless @before_all_hax_kill_resque
+  TestHelper.hax_kill_resque && @before_all_hax_kill_resque=true
+end

data/test/test_integration.rb

@@ -58,6 +58,8 @@ class TestIntegration < Minitest::Test
     with_no_resque_failures do
       Resque::StuckQueue.config[:trigger_timeout] = 10
       Resque::StuckQueue.config[:heartbeat] = 1
+      Resque::StuckQueue.config[:redis] = Redis.new
+
       @triggered = false
       Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
       start_and_stop_loops_after(5)
@@ -72,6 +74,8 @@ class TestIntegration < Minitest::Test
     with_no_resque_failures do
       Resque::StuckQueue.config[:trigger_timeout] = 0
       Resque::StuckQueue.config[:heartbeat] = 1
+      Resque::StuckQueue.config[:redis] = Redis.new
+
       @triggered = false
       Resque::StuckQueue.config[:triggered_handler] = proc { @triggered = true }
       start_and_stop_loops_after(2)
@@ -86,7 +90,7 @@ class TestIntegration < Minitest::Test
     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)
+      Resque::StuckQueue.config[: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.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-31 00:00:00 Z
+date: 2014-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-mutex