resque_stuck_queue 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 21e22e07449416caa592d83157978103b6d3cb25
-  data.tar.gz: 52261706a53625364f3bddc7c531e8e1a1e38fa8
 SHA512: 
-  metadata.gz: 8da0b6facf25ed6034205a78d0ace7cac2c62aae772b6fbd0a2ae4c7d4fa5964f61f7ee341b7c784ef3e30b89561d4cff1fb012faf97f3206d1e54a87845b0d3
-  data.tar.gz: e1fa87dff4f06d265d2e9a9a5facfe84fa9a1d42891c1f1e259f3850c8fe9ce10e032eeff2b9955bdf827ba5142520f542bc318ee8879669fbee2e1c524f9a9f
+  data.tar.gz: c61972d3ea6fbc28feaf6b720c24fa48c3d78ce06967e2b00762fb5dd3dd6d6ad1014616300b37299ee693b9c4a25dcddfc30a923b85285b35d24fe383639a6c
+  metadata.gz: f3e6cb7aeb0843612de8ccaccd6fcea4efab227d525ca3dcfca053d70e13a229ddd24ae8b43dc4cdc9b5c6bf3bd940fd1fa26dc8657f2ba248fc3fdbe85c590d
+SHA1: 
+  data.tar.gz: 1347fccc7e4b37ea0a0626a176d904c223c4d21b
+  metadata.gz: 9f217dadd17a7ff267b66b858330218c1e9f24fc

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gemspec
+
 if ENV['RESQUE_2']
 # resque 2
   gem 'resque', :git => "https://github.com/engineyard/resque.git"

data/README.md

@@ -41,7 +41,7 @@ triggered_handler:
 	Resque::StuckQueue.config[:triggered_handler] = proc { |queue_name, lagtime| send_email('queue #{queue_name} isnt working, aaah the daemons') }
 
 recovered_handler:
-	set to what gets triggered when resque-stuck-queue has triggered a problem, but then detects the queue went back down to functioning well again (it wont trigger again until it has recovered).
+	set to what gets triggered when resque-stuck-queue has triggered a problem, but then detects the queue went back down to functioning well again(it wont trigger again until it has recovered).
 	Example:
 	Resque::StuckQueue.config[:recovered_handler] = proc { |queue_name, lagtime| send_email('phew, queue #{queue_name} is ok') }
 
@@ -56,7 +56,7 @@ trigger_timeout:
 	Resque::StuckQueue.config[:trigger_timeout] = 55.minutes
 
 redis:
-	set the Redis instance StuckQueue will use
+	set the Redis StuckQueue will use. Either a Redis or Redis::Namespace instance.
 
 heartbeat_key:
 	optional, name of keys to keep track of the last good resque heartbeat time
@@ -75,7 +75,6 @@ abort_on_exception:
 
 heartbeat_job:
 	optional, your own custom refreshing job. if you are using something other than resque
-
 </pre>
 
 To start it:

data/lib/resque_stuck_queue.rb

@@ -25,13 +25,8 @@ module Resque
       end
 
       def redis
-        @redis ||= (config[:redis] || Resque.redis)
-      end
-
-      def redis=(rds)
-        # for resq2 tests
-        @redis = rds
-        Resque.redis = @redis
+        @redis ||= (config[:redis] || raise(Config::NoConfigError, "Must configure a redis instance to use. Please set a Redis or Redis::Namespace."))
+        HeartbeatJob.redis = @redis
       end
 
       def heartbeat_key_for(queue)
@@ -142,7 +137,7 @@ module Resque
           config[:heartbeat_job].call
         else
           queues.each do |queue_name|
-            Resque.enqueue_to(queue_name, HeartbeatJob, [heartbeat_key_for(queue_name), redis.client.host, redis.client.port])
+            Resque.enqueue_to(queue_name, HeartbeatJob, heartbeat_key_for(queue_name))
           end
         end
       end

data/lib/resque_stuck_queue/config.rb

@@ -19,13 +19,14 @@ module Resque
         :recovered_handler  => "set to what gets triggered when resque-stuck-queue has triggered a problem, but then detects the queue went back down to functioning well again(it wont trigger again until it has recovered).\n\tExample:\n\tResque::StuckQueue.config[:recovered_handler] = proc { |queue_name, lagtime| send_email('phew, queue \#{queue_name} is ok') }",
         :heartbeat          => "set to how often to push that 'heartbeat' job to refresh the latest time it worked.\n\tExample:\n\tResque::StuckQueue.config[:heartbeat] = 5.minutes",
         :trigger_timeout    => "set to how much of a resque work lag you are willing to accept before being notified. note: take the :heartbeat setting into account when setting this timeout.\n\tExample:\n\tResque::StuckQueue.config[:trigger_timeout] = 55.minutes",
-        :redis              => "set the Redis instance StuckQueue will use",
+        :redis              => "set the Redis StuckQueue will use. Either a Redis or Redis::Namespace instance.",
+
         :heartbeat_key      => "optional, name of keys to keep track of the last good resque heartbeat time",
         :triggered_key      => "optional, name of keys to keep track of the last trigger time",
         :logger             => "optional, pass a Logger. Default a ruby logger will be instantiated. Needs to respond to that interface.",
         :queues             => "optional, monitor specific queues you want to send a heartbeat/monitor to. default is :app",
         :abort_on_exception => "optional, if you want the resque-stuck-queue threads to explicitly raise, default is false",
-        :heartbeat_job        => "optional, your own custom refreshing job. if you are using something other than resque",
+        :heartbeat_job      => "optional, your own custom refreshing job. if you are using something other than resque",
       }
 
       OPTIONS = OPTIONS_DESCRIPTIONS.keys

data/lib/resque_stuck_queue/heartbeat_job.rb

@@ -1,13 +1,14 @@
 module Resque
   module StuckQueue
     class HeartbeatJob
-      def self.perform(args)
-        timestamp_key = args[0]
-        host = args[1]
-        port = args[2]
-        new_time = Time.now.to_i
-        r = Redis.new(:host => host, :port => port)
-        r.set(timestamp_key, new_time)
+      class << self
+
+        attr_accessor :redis
+
+        def perform(keyname)
+          @redis.set(keyname, Time.now.to_i)
+        end
+
       end
     end
   end

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/resque_stuck_queue.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "redis-mutex"
+  spec.add_runtime_dependency "redis-mutex" # TODO rm this
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "redis-namespace"
 end

data/test/test_collision.rb

@@ -5,7 +5,7 @@ class TestCollision < Minitest::Test
   include TestHelper
 
   def setup
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
     Resque::StuckQueue.redis.flushall
   end
 

data/test/test_integration.rb

@@ -37,7 +37,7 @@ class TestIntegration < Minitest::Test
   end
 
   def setup
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
     Resque::StuckQueue.redis.flushall
     Resque::StuckQueue.config[:abort_on_exception] = true
     self.class.run_resque_before_all

data/test/test_lagtime.rb

@@ -12,7 +12,7 @@ class TestLagTime < Minitest::Test
   include TestHelper
 
   def setup
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
     Resque::StuckQueue.redis.flushall
     Resque::StuckQueue.config[:abort_on_exception] = true
   end

data/test/test_named_queues.rb

@@ -8,7 +8,7 @@ class TestNamedQueues < Minitest::Test
     Resque::StuckQueue.config[:trigger_timeout] = 1
     Resque::StuckQueue.config[:heartbeat] = 1
     Resque::StuckQueue.config[:abort_on_exception] = true
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
     Resque::StuckQueue.redis.flushall
   end
 

data/test/test_resque_2.rb

@@ -16,13 +16,13 @@ if !ENV['RESQUE_2'].nil?
 
     def setup
       assert (Resque::VERSION.match /^2\./), "must run in 2.0"
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
       Redis.new.flushall
     end
 
    def test_works_with_2_point_oh_do_not_trigger_because_key_is_updated
 
-     Resque::StuckQueue.redis = Redis.new
+     Resque::StuckQueue.config[:redis] = Redis.new
 
      Resque::StuckQueue.config[:heartbeat] = 1
      Resque::StuckQueue.config[:abort_on_exception] = true
@@ -34,7 +34,7 @@ if !ENV['RESQUE_2'].nil?
      #binding.pry
      Resque::StuckQueue.start_in_background
 
-     @r2_pid = fork { Resque::StuckQueue.redis = Redis.new ; Resque::Worker.new("*", :graceful_term => true).work ; Process.waitall }
+     @r2_pid = fork { Resque::StuckQueue.config[: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

@@ -12,12 +12,17 @@ class TestResqueStuckQueue < Minitest::Test
   def setup
     puts "#{__method__}"
     # clean previous test runs
-    Resque::StuckQueue.redis = Redis.new
+    Resque::StuckQueue.config[:redis] = Redis.new
     Resque::StuckQueue.redis.flushall
     Resque::StuckQueue.config[:heartbeat]   = 1 # seconds
     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"

data/test/test_set_custom_refresh_job.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -40,6 +40,14 @@ dependencies:
     - *id003
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: redis-namespace
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  type: :development
+  version_requirements: *id005
 description: where the wild things are. err, when resque gets stuck
 email: 
 - srosenfeld@engineyard.com