resque_stuck_queue 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: 6c8dd3d5b2ca90f0fd794199e5fdba0cb01b049787940b704d004792b2d9bbaddac99dfcb6ee1330cdacfa7ade687ecfaf120379afd281a49920f746ad7dac9b
-  metadata.gz: 4794029e21d89246d8c4463015938144dce0e4c7bc1bc5e2e178ea6f96b6d51ade8fc6fbe34efe32d51967a5661c9365dc5b1cbcec5729966aeeb764bcfe6c1b
 SHA1: 
-  data.tar.gz: 0c9dd4826b15ffbd7cbf6621efd8ae6ed896cd13
-  metadata.gz: 64a065870397ca03be56a44fdc67b2551be9bdea
+  metadata.gz: ff3a3dc45cf54e383a1fdc54140cd7a00f9a3914
+  data.tar.gz: 0d80baf43a00b1995d6805cf04059fe1c10d1a68
+SHA512: 
+  metadata.gz: a5ec94eb3aded1e0ca4999c27aa844593d73db41cc714c012f0ac0c067adfc6c670691e2c61c42839dd32c5bbeb7e84a1f1a7f63dda7766c1a1e52a1de2a5ab5
+  data.tar.gz: 836c6616ab7716710fd27e1cda3a1ceac824388166aeb215af989acda8f9ddbab7dbe955a35ddac4ff3eef94e3ee9f72ce74b46408be3978cc2ee28da753d085

data/lib/resque_stuck_queue/heartbeat_job.rb

@@ -5,7 +5,9 @@ module Resque
 
         attr_accessor :redis
 
-        def perform(keyname)
+        def perform(*args)
+          keyname,host,port,namespace = args
+          Redis::Namespace.new(namespace, :redis => Redis.new(:host => host, :port => port))
           @redis.set(keyname, Time.now.to_i)
         end
 

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/lib/resque_stuck_queue.rb

@@ -3,6 +3,8 @@ require "resque_stuck_queue/config"
 require "resque_stuck_queue/heartbeat_job"
 require "resque_stuck_queue/signals"
 
+require 'redis-namespace'
+
 # TODO move this require into a configurable?
 require 'resque'
 
@@ -26,7 +28,6 @@ module Resque
 
       def redis
         @redis ||= config[:redis]
-        HeartbeatJob.redis = @redis
       end
 
       def heartbeat_key_for(queue)
@@ -142,7 +143,9 @@ module Resque
           config[:heartbeat_job].call
         else
           queues.each do |queue_name|
-            Resque.enqueue_to(queue_name, HeartbeatJob, heartbeat_key_for(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 ])
           end
         end
       end

data/resque_stuck_queue.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "redis-mutex" # TODO rm this
 
+  spec.add_runtime_dependency "redis-namespace"
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "redis-namespace"
 end

data/test/test_resque_stuck_queue.rb

@@ -18,11 +18,6 @@ class TestResqueStuckQueue < Minitest::Test
     Resque::StuckQueue.config[:abort_on_exception] = true
   end
 
-  def test_watcher_and_heartbeat_redis_are_the_same
-    # to avoid namespace collisions
-    assert_equal Resque::StuckQueue.redis, Resque::StuckQueue::HeartbeatJob.redis
-  end
-
   def test_configure_heartbeat_key
     puts "#{__method__}"
     assert_nil Resque::StuckQueue.redis.get("it-is-configurable"), "global key should not be set"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -9,43 +9,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-30 00:00:00 Z
+date: 2014-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-mutex
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id003 
+    - &id002 
       - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: redis-namespace
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
-  type: :development
-  version_requirements: *id002
+    - *id002
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: bundler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id003
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: redis-namespace
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id003
+    - *id002
   type: :development
   version_requirements: *id005
 description: where the wild things are. err, when resque gets stuck
@@ -93,10 +93,10 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id003
+  - *id002
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id003
+  - *id002
 requirements: []
 
 rubyforge_project: