resque_stuck_queue 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: c007b83586030670c60f58d0a5e578a058a49f54588edba34367605afac5906bea2671f589a1f03f2617329e134bc3e34ea3a6959aec95920bf2b01c63be38c1
-  metadata.gz: 86e182c1fd44835e6b899fbd21762ebeb8eeb5ba5b09d233cef6203e130468bf8cca071dc3bf9c0d6ce86c55e3b9fb77ce3816b261f36f40652cb71ff398669f
-SHA1: 
-  data.tar.gz: 17d8ce55b4fb7e5bb071eada32ccb76060ccc7e0
-  metadata.gz: a3bed0e656224a0df49636c93e8344374dd612f4
+---
+SHA1:
+  metadata.gz: e3173c9944a71c3baf91b7e3792619f44c414c09
+  data.tar.gz: 068a8ca0c8688b3ff2ed27c7eb382fb361277bb4
+SHA512:
+  metadata.gz: 75f2f2021dffa38b41909de2d26bcae9fc374e62a4b78eb8d2818d4a4295b5e248b9e52fddf500edc6b9bb11e5f9cfed9921479aa4869516362101a69a158a25
+  data.tar.gz: 6ca49f65b55a4a351bc54d1178e174384dc689f5997de168e9e1cadaefb9f78a93b50a7e9f091c0038a35181bfe85d628a40eecd3b6bbab12a2cc0e9e66fcd1c

data/Gemfile

@@ -10,6 +10,7 @@ else
 end
 
 gem 'redis-mutex'
+gem 'redis-classy'
 
 # TEST
 gem 'minitest'

data/README.md

@@ -30,6 +30,8 @@ After firing the proc, it will continue to monitor the queue, but won't call the
 
 By calling the recovered proc, it will then complain again the next time the lag is found.
 
+You can also configure it to periodically trigger unless of couse it's recovered/good again (see the `:warn_interval` below).
+
 ## Usage
 
 Run this as a daemon somewhere alongside the app/in your setup. You'll need to configure it to your needs first:
@@ -44,6 +46,7 @@ require 'logger'
 Resque::StuckQueue.config[:heartbeat_interval]       = 10.seconds
 Resque::StuckQueue.config[:watcher_interval]         = 1.seconds
 Resque::StuckQueue.config[:trigger_timeout]          = 30.seconds # acceptable lagtime
+Resque::StuckQueue.config[:warn_interval]            = 5.minutes  # keep on triggering periodically, default is only one trigger
 
 # which queues to monitor
 Resque::StuckQueue.config[:queues]                   = [:app, :custom_queue]
@@ -101,7 +104,6 @@ $ bundle exec rake --trace resque:stuck_queue # outdated god config - https://gi
 Configuration settings are below. You'll most likely at the least want to tune `:triggered_handler`,`:heartbeat_interval` and `:trigger_timeout` settings.
 
 <pre>
-
 triggered_handler:
 	set to what gets triggered when resque-stuck-queue will detect the latest heartbeat is older than the trigger_timeout time setting.
 	Example:
@@ -127,6 +129,9 @@ trigger_timeout:
 	Example:
 	Resque::StuckQueue.config[:trigger_timeout] = 9.minutes
 
+warn_interval:
+	optional: if set, it will continiously trigger/warn in spaces of this interval after first trigger. eg, as long as lagtime keeps on being above trigger_timeout/recover hasn't occured yet.
+
 redis:
 	set the Redis StuckQueue will use. Either a Redis or Redis::Namespace instance.
 
@@ -150,7 +155,6 @@ heartbeat_job:
 
 enable_signals:
 	optional, allow resque::stuck's signal_handlers which do mostly nothing at this point. possible future plan: log info, reopen log file, etc.
-
 </pre>
 
 To start it:

data/Rakefile

@@ -21,6 +21,7 @@ task :'resque:setup' do
   Dir["./lib/resque_stuck_queue.rb"].each {|file| require file}
 end
 
-require 'resque_scheduler/tasks'
+require 'resque/scheduler/tasks'
+
 task "resque:scheduler_setup"
 

data/THOUGHTS

@@ -5,3 +5,5 @@ rm require resque?
 
 refactor tests to have an around(:suite) to run with resque beforehand (no startup time) and just run test_integration.rb 
   (& compact dup tests etc)
+
+don't continue to send heartbeat job if its alerting/stuck, it can just back the queue up (even if just marginally) more.

data/lib/resque_stuck_queue.rb

@@ -1,7 +1,6 @@
 require "resque_stuck_queue/version"
 require "resque_stuck_queue/config"
 require "resque_stuck_queue/heartbeat_job"
-require "resque_stuck_queue/signals"
 
 require 'redis-namespace'
 
@@ -77,13 +76,11 @@ module Resque
         config.validate_required_keys!
         config.freeze
 
-        Signals.enable!
-
         log_starting_info
 
         reset_keys
 
-        Redis::Classy.db = redis if Redis::Classy.db.nil?
+        RedisClassy.redis = redis if RedisClassy.redis.nil?
 
         pretty_process_name
 
@@ -174,7 +171,7 @@ module Resque
           Thread.current.abort_on_exception = abort_on_exception
           log_starting_thread(:watcher)
           while @running
-            mutex = Redis::Mutex.new('resque_stuck_queue_lock', block: 0)
+            mutex = RedisMutex.new(:resque_stuck_queue, :block => 0)
             if mutex.lock
               begin
                 queues.each do |queue_name|

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/test/test_config.rb

@@ -49,19 +49,18 @@ class TestConfig < Minitest::Test
     end
   end
 
-  # FIXME
-  def test_can_have_signals
-    puts "#{__method__}"
-    begin
-      assert_equal ENV['SIGUSR1'], nil
-      Resque::StuckQueue.config[:enable_signals] = true
-      start_and_stop_loops_after(1)
-      Process.kill "SIGUSR1", Process.pid
-      assert_equal ENV['SIGUSR1'], "done be had"
-    rescue => e
-      assert false, "should have succeeded with signal handlers: #{e.inspect}\n#{e.backtrace.join("\n")}"
-    end
-  end
+  #def test_can_have_signals
+    #puts "#{__method__}"
+    #begin
+      #assert_equal ENV['SIGUSR1'], nil
+      #Resque::StuckQueue.config[:enable_signals] = true
+      #start_and_stop_loops_after(1)
+      #Process.kill "SIGUSR1", Process.pid
+      #assert_equal ENV['SIGUSR1'], "done be had"
+    #rescue => e
+      #assert false, "should have succeeded with signal handlers: #{e.inspect}\n#{e.backtrace.join("\n")}"
+    #end
+  #end
 
 end
 

metadata

@@ -1,64 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque_stuck_queue
-version: !ruby/object:Gem::Version 
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Shai Rosenfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis-mutex
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redis-namespace
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: where the wild things are. err, when resque gets stuck
-email: 
+email:
 - srosenfeld@engineyard.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,7 +83,6 @@ files:
 - lib/resque_stuck_queue.rb
 - lib/resque_stuck_queue/config.rb
 - lib/resque_stuck_queue/heartbeat_job.rb
-- lib/resque_stuck_queue/signals.rb
 - lib/resque_stuck_queue/version.rb
 - resque_stuck_queue.gemspec
 - test/resque/set_redis_key.rb
@@ -82,29 +96,30 @@ files:
 - test/test_set_custom_refresh_job.rb
 - test/test_ver_2.rb
 homepage: https://github.com/shaiguitar/resque_stuck_queue/
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: fire a handler when your queues are wonky
-test_files: 
+test_files:
 - test/resque/set_redis_key.rb
 - test/test_collision.rb
 - test/test_config.rb

data/lib/resque_stuck_queue/signals.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-module Resque
-  module StuckQueue
-    module Signals
-      extend self
-
-      def enable!
-        if Resque::StuckQueue.config[:enable_signals]
-
-          trap("SIGUSR1") do
-            ENV['SIGUSR1'] = "done be had"
-            Resque::StuckQueue.logger.info("Inspecting StuckQueue config: #{Resque::StuckQueue.config.inspect}")
-            Resque::StuckQueue.queues.each do |q| Resque::StuckQueue.log_watcher_info(q) end
-            Resque::StuckQueue.logger.info("¯\_(ツ)_/¯ ...")
-          end
-
-          # do something meaningful
-          #trap("SIGUSR2") do
-          #  require 'pry'
-          #  binding.pry
-          #end
-
-        end
-      end
-    end
-  end
-end