resque_stuck_queue 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 45a7b50263556a7d07eaaee7c006033479ba01f2
-  metadata.gz: 8b0c17d7a88388d815317a82502f37f6f57d3a8a
+  data.tar.gz: cd305cd673750663559d00b2b6412f19becc6a50
+  metadata.gz: 27e1e7879f29cb47777bfaf71dc85dac57458812
 SHA512: 
-  data.tar.gz: eb8d73f5882b34d63c5cee3cf4cb8bec0e66a2c9b3f30355772042284a93c98bf01357e936fab39904015c5f093588d471af1583daaf8cff6c856870b35fef48
-  metadata.gz: 714f459c5ae47a20353efc148050a2e7957557776110852266688e84d9c3ab36a908831b56a5fde7d18293181569722f925716c1ac7fbd3e0c9b0762bd59648b
+  data.tar.gz: 2a99f6cb2b8efa736a22b02ef89245b09f58b86e0ed9189623979e8561d59101b5e88c74c6354a8ee4f26b8a66d5c9e5473a1c471ee4daa893f57136c2f3d8b6
+  metadata.gz: 08d93e4f41bfb98204c7c3cb2c3df9291d65876f11cc339559753be824dfb42f4a79f442eab1e7af0f25daf3647e058cd924172efe0eabc04bd69fb8e8756b80

data/.gitignore

@@ -1 +1,2 @@
 *gem
+Gemfile.lock

data/README.md

@@ -41,6 +41,9 @@ Resque::StuckQueue.config[:handler] = proc { send_email }
 # optional, in case you want to set your own name for the key that will be used as the last good hearbeat time
 Resque::StuckQueue.config[:global_key] = "name-the-refresh-key-as-you-please"
 
+# optional, monitor a specific redis queue
+Resque::StuckQueue.config[:queue_name] = :app
+
 # optional, if you want the resque-stuck-queue threads to explicitly raise, default is false
 Resque::StuckQueue.config[:abort_on_exception] = true
 
@@ -49,6 +52,9 @@ Resque::StuckQueue.config[:logger] = Logger.new($stdout)
 
 # optional, pass a redis. 
 Resque::StuckQueue.config[:redis] = Redis.new
+
+# optional, your own custom refresh job. below has an example.
+Resque::StuckQueue.config[:refresh_job] = proc { your_own_enqueue_refreshing_global_key }
 </pre>
 
 Then start it:
@@ -103,7 +109,7 @@ $ bundle exec rake --trace resque:stuck_queue
 
 ## Sidekiq/Other redis-based job queues
 
-If you have trouble with other queues you can use this lib by setting your own custom refresh job (aka, the job that refreshes the global_key). The one thing you need to take care of is ensure whatever and however you enque your own custom job, it sets the global_key to Time.now. Then do:
+If you have trouble with other queues you can use this lib by setting your own custom refresh job (aka, the job that refreshes the global_key). The one thing you need to take care of is ensure whatever and however you enque your own custom job, it sets the global_key to Time.now:
 
 <pre>
 

data/THOUGHTS

@@ -11,3 +11,6 @@ add a 'resque_stuck_queue/tasks' bit? See tres eg
 require 'resque/stuck_queue' instead?
 ensure the logging gets flushed into log file correctly? (integration with god?)
 add a trap{} to force_stop. ok for overwriting process's trap handlers? use config for that?
+
+fix skeleton recipe https://github.com/shaiguitar/resque_stuck_queue/blame/master/README.md#L103
+  raise appname, => :environment, log path

data/lib/resque_stuck_queue.rb

@@ -104,7 +104,11 @@ module Resque
 
       def global_key
         # public, for use in custom heartbeat job
-        config[:global_key] || GLOBAL_KEY
+        "#{named_queue}:#{config[:global_key] || GLOBAL_KEY}"
+      end
+
+      def named_queue
+        config[:named_queue] || :app
       end
 
       private
@@ -191,11 +195,11 @@ module Resque
 end
 
 class RefreshLatestTimestamp
-  @queue = :app
+  @queue = Resque::StuckQueue.named_queue
   def self.perform(args)
     timestamp_key = args[0]
-    host = args[1] || "localhost"
-    port = args[2] || "6379"
+    host = args[1]
+    port = args[2]
     r = Redis.new(:host => host, :port => port)
     r.set(timestamp_key, Time.now.to_i)
   end

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/test/test_helper.rb

@@ -2,6 +2,8 @@ require 'minitest'
 require "minitest/autorun"
 require 'pry'
 require 'mocha'
+require "minitest/unit"
+require "mocha/mini_test"
 $:.unshift(".")
 require 'resque_stuck_queue'
 require File.join(File.expand_path(File.dirname(__FILE__)), "resque", "set_redis_key")

data/test/test_named_queue.rb

@@ -0,0 +1,35 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+class TestNamedQueue < Minitest::Test
+
+  include TestHelper
+
+  def setup
+    Resque::StuckQueue.config[:trigger_timeout] = 1
+    Resque::StuckQueue.config[:heartbeat] = 1
+    Resque::StuckQueue.config[:abort_on_exception] = true
+  end
+
+  def teardown
+    Resque::StuckQueue.reset!
+  end
+
+  def test_no_custom_named_queue
+    puts "#{__method__}"
+    Resque::StuckQueue.config[:named_queue] = nil
+    start_and_stop_loops_after(2)
+    assert_equal Resque::StuckQueue.global_key, "app:resque-stuck-queue"
+    assert_equal Resque::StuckQueue.named_queue, :app
+  end
+
+  def test_has_custom_named_queue
+    puts "#{__method__}"
+    Resque::StuckQueue.config[:named_queue] = :foo
+    start_and_stop_loops_after(2)
+    assert_equal Resque::StuckQueue.global_key, "foo:resque-stuck-queue"
+    assert_equal Resque::StuckQueue.named_queue, :foo
+  end
+
+end
+
+

data/test/test_resque_stuck_queue.rb

@@ -7,6 +7,7 @@ class TestResqueStuckQueue < Minitest::Test
   def teardown
     puts "#{__method__}"
     Resque::StuckQueue.unstub(:read_from_redis)
+    Resque::StuckQueue.config.clear
   end
 
   def setup
@@ -22,7 +23,7 @@ class TestResqueStuckQueue < Minitest::Test
     assert_nil Resque.redis.get("it-is-configurable"), "global key should not be set"
     Resque::StuckQueue.config[:global_key] = "it-is-configurable"
     start_and_stop_loops_after(2)
-    refute_nil Resque.redis.get("it-is-configurable"), "global key should be set"
+    refute_nil Resque.redis.get("app:it-is-configurable"), "global key should be set"
   end
 
   def test_it_does_not_trigger_handler_if_under_max_time

data/test/test_set_custom_refresh_job.rb

@@ -40,5 +40,4 @@ class TestYourOwnRefreshJob < Minitest::Test
     end
   end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-14 00:00:00 Z
+date: 2014-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-mutex
@@ -52,7 +52,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -67,6 +66,7 @@ files:
 - test/test_helper.rb
 - test/test_integration.rb
 - test/test_logger.rb
+- test/test_named_queue.rb
 - test/test_resque_2.rb
 - test/test_resque_stuck_queue.rb
 - test/test_set_custom_refresh_job.rb
@@ -100,6 +100,7 @@ test_files:
 - test/test_helper.rb
 - test/test_integration.rb
 - test/test_logger.rb
+- test/test_named_queue.rb
 - test/test_resque_2.rb
 - test/test_resque_stuck_queue.rb
 - test/test_set_custom_refresh_job.rb

data/Gemfile.lock

@@ -1,58 +0,0 @@
-GIT
-  remote: https://github.com/engineyard/resque.git
-  revision: 2949f9f5b035c59a7c03999c00558544837324b5
-  specs:
-    resque (2.0.0.pre.1)
-      json
-      mono_logger (~> 1.0)
-      redis-namespace (>= 1.3.0)
-      thor (~> 0.17)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.0)
-    json (1.8.1)
-    m (1.3.2)
-      method_source (>= 0.6.7)
-      rake (>= 0.9.2.2)
-    metaclass (0.0.1)
-    method_source (0.8.2)
-    minitest (5.2.0)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    mono_logger (1.1.0)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.1.0)
-    redis (3.0.6)
-    redis-classy (1.2.0)
-      redis-namespace (~> 1.0)
-    redis-mutex (2.1.1)
-      redis-classy (~> 1.2)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
-    resque-scheduler (2.0.1)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
-    rufus-scheduler (2.0.19)
-      tzinfo (>= 0.3.23)
-    slop (3.4.7)
-    thor (0.18.1)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  m
-  minitest
-  mocha
-  pry
-  rake
-  redis-mutex
-  resque!
-  resque-scheduler