resque_stuck_queue 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 4afb591b2c6fd8c3fc37a27dd92d54af07de3e2e
-  metadata.gz: 19702480a46ba718628bcb98c6f0eab1fa0c2261
+  metadata.gz: 4e70424faa8ec9ad5fe004e176521d4563b6b585
+  data.tar.gz: 11fb88f2d886993e99fbdd65ec2ec0f4a1b62d1a
 SHA512: 
-  data.tar.gz: b05278c44a84b631e5e43a1e1ba84f3d29971e075526cf16d926ed8dbb921b8399f3da4aa4a309b4f50e90c6722a5b8dbfdf1b0219c22153cc7e558e02377b6b
-  metadata.gz: 727b6ec883cf0fdec4a23a4235675309c7ea321704e204991eddfc311432e846392432799837a153d55429b8518ddd39936caca101d8541760bf80f8c7aa1d80
+  metadata.gz: 9c4b847e85b9b3741690a131a883d77cb7906099a1f8fada7b5139505e7a69f2a5c66a49c4ca3a35e0eab921d5c68fe0d43567291774d811ec69cc6256f510e7
+  data.tar.gz: 62750b5b3736c284c9f10f58b37344e4750e4e0454d68a2016636d73854186b2eed89eef9eb7456866927103003c8803112aae48582a6e5050fd68f5241c4eea

data/README.md

@@ -35,34 +35,36 @@ require 'resque_stuck_queue' # or require 'resque/stuck_queue'
 require 'logger'
 
 # change to decent values that make sense for you
-Resque::StuckQueue.config[:heartbeat_interval]           = 10.seconds
-Resque::StuckQueue.config[:trigger_timeout]     = 30.seconds
-
-# create a sync/unbuffered log
-logpath = Rails.root.join('log', 'resque_stuck_queue.log')
-logfile = File.open(logpath, "a")
-logfile.sync = true
-logger = Logger.new(logfile)
-logger.formatter = Logger::Formatter.new
-Resque::StuckQueue.config[:logger] = logger
-
-Resque::StuckQueue.config[:redis]  = YOUR_REDIS
+Resque::StuckQueue.config[:heartbeat_interval]       = 10.seconds
+Resque::StuckQueue.config[:watcher_interval]         = 1.seconds
+Resque::StuckQueue.config[:trigger_timeout]          = 30.seconds
 
 # which queues to monitor
-Resque::StuckQueue.config[:queues] = [:app, :custom_queue]
+Resque::StuckQueue.config[:queues]                   = [:app, :custom_queue]
 
 # handler for when a resque queue is being problematic
-Resque::StuckQueue.config[:triggered_handler] = proc { |bad_queue, lagtime|
+Resque::StuckQueue.config[:triggered_handler]         = proc { |bad_queue, lagtime|
   msg = "[BAD] AWSM #{Rails.env}'s Resque #{bad_queue} queue lagging job execution by #{lagtime} seconds."
   send_email(msg)
 }
 
 # handler for when a resque queue recovers
-Resque::StuckQueue.config[:recovered_handler] = proc { |good_queue, lagtime|
+Resque::StuckQueue.config[:recovered_handler]         = proc { |good_queue, lagtime|
   msg = "[GOOD] AWSM #{Rails.env}'s Resque #{good_queue} queue lagging job execution by #{lagtime} seconds."
   send_email(msg)
 }
 
+# create a sync/unbuffered log
+logpath = Rails.root.join('log', 'resque_stuck_queue.log')
+logfile = File.open(logpath, "a")
+logfile.sync = true
+logger = Logger.new(logfile)
+logger.formatter = Logger::Formatter.new
+Resque::StuckQueue.config[:logger]                    = logger
+
+# your own redis
+Resque::StuckQueue.config[:redis]                     = YOUR_REDIS
+
 </pre>
 
 Then create a task to run it as a daemon (similar to how the resque rake job is implemented):

data/THOUGHTS

@@ -1,20 +1,4 @@
-other resources:
-
-  http://vitobotta.com/resque-automatically-kill-stuck-workers-retry-failed-jobs/#sthash.oQsaNeb5.dpbs
-  http://stackoverflow.com/questions/10757758/find-out-if-a-resque-job-is-still-running-and-kill-it-if-its-stuck
-
 ## TODOS
 
-add a 'resque_stuck_queue/tasks' bit? See tres eg
-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
-
-investigate: why is temple getting triggered? how often? is the enqueing/checking taking too much time?
-also, if one queue is bad, does it trigger other queue's handlers? write some tests, asshole.
-woes of redis namespace, in regards to Awsm.redis != Resque.redis etc. (which is important for setting the key through @redis)
-
-with lag time, it will continue to trigger, for every heartbeat time it's supposed to tick, find some way to do that, and then maybe add some resolved handler/proc?
-
 rm redis locking (since it works by keys now, no need for it, recover/trigger ping pong).
+rm require resque?

data/lib/resque_stuck_queue.rb

@@ -54,9 +54,17 @@ module Resque
         @queues ||= (config[:queues] || [:app])
       end
 
+      def abort_on_exception
+        if !config[:abort_on_exception].nil?
+          config[:abort_on_exception] # allow overriding w false
+        else
+          true # default
+        end
+      end
+
       def start_in_background
         Thread.new do
-          Thread.current.abort_on_exception = config[:abort_on_exception]
+          Thread.current.abort_on_exception = abort_on_exception
           self.start
         end
       end
@@ -127,7 +135,7 @@ module Resque
 
       def setup_heartbeat_thread
         @threads << Thread.new do
-          Thread.current.abort_on_exception = config[:abort_on_exception]
+          Thread.current.abort_on_exception = abort_on_exception
           logger.info("Starting heartbeat thread")
           while @running
             # we want to go through resque jobs, because that's what we're trying to test here:
@@ -154,7 +162,7 @@ module Resque
 
       def setup_watcher_thread
         @threads << Thread.new do
-          Thread.current.abort_on_exception = config[:abort_on_exception]
+          Thread.current.abort_on_exception = abort_on_exception
           logger.info("Starting watcher thread")
           while @running
             mutex = Redis::Mutex.new('resque_stuck_queue_lock', block: 0)

data/lib/resque_stuck_queue/config.rb

@@ -29,7 +29,7 @@ module Resque
         :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",
+        :abort_on_exception => "optional, if you want the resque-stuck-queue threads to explicitly raise, default is true",
         :heartbeat_job      => "optional, your own custom refreshing job. if you are using something other than resque",
         :enable_signals     => "optional, allow resque::stuck's signal_handlers which do mostly nothing at this point.",
       }

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-02 00:00:00 Z
+date: 2014-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-mutex