Merge pull request resque#671 from steveklabnik/mother_of_all_pull_requests

Mother of all pull requests

Author: steveklabnik

README.markdown

@@ -22,7 +22,7 @@ pending jobs rising.
 Now in another shell terminal start the worker:
 
     $ cd resque/examples/demo
-    $ VERBOSE=true QUEUE=default rake resque:work
+    $ VERBOSE=true QUEUE=default,failing rake resque:work
 
 You should see the following output:
 
@@ -33,7 +33,7 @@ You should see the following output:
 
 You can also use `VVERBOSE` (very verbose) if you want to see more:
 
-    $ VVERBOSE=true QUEUE=default rake resque:work
+    $ VERBOSE=true QUEUE=default,failing rake resque:work
     *** Starting worker hostname:90399:default
     ** [05:55:09 2009-09-16] 90399: Registered signals
     ** [05:55:09 2009-09-16] 90399: Checking default

examples/demo/README.markdown

@@ -2,17 +2,22 @@
 # processes. Their sacrifice is for the greater good.
 
 WORKER_TIMEOUT = 60 * 10 # 10 minutes
+STALE_EXEMPTIONS = ["imports"]
 
 Thread.new do
   loop do
     begin
-      `ps -e -o pid,command | grep [r]esque`.split("\n").each do |line|
+      lines = `ps -e -o pid,command | grep [r]esque`.split("\n")
+      lines.each do |line|
         parts   = line.split(' ')
         next if parts[-2] != "at"
         started = parts[-1].to_i
         elapsed = Time.now - Time.at(started)
 
         if elapsed >= WORKER_TIMEOUT
+          parent = lines.detect { |line| line.split(" ").first == parts[3] }
+          queue = parent.split(" ")[3]
+          next if STALE_EXEMPTIONS.include?(queue)
           ::Process.kill('USR1', parts[0].to_i)
         end
       end

examples/god/stale.god

@@ -65,7 +65,7 @@ def coder
   # create a new one.
   def redis
     return @redis if @redis
-    self.redis = Redis.respond_to?(:connect) ? Redis.connect : "localhost:6379"
+    self.redis = Redis.respond_to?(:connect) ? Redis.connect(:thread_safe => true) : "localhost:6379"
     self.redis
   end
 
@@ -139,7 +139,7 @@ def to_s
   # Pushes a job onto a queue. Queue name should be a string and the
   # item should be any JSON-able Ruby object.
   #
-  # Resque works generally expect the `item` to be a hash with the following
+  # Resque workers generally expect the `item` to be a hash with the following
   # keys:
   #
   #   class - The String name of the job to run.

lib/resque.rb

@@ -5,7 +5,7 @@ module Failure
     class Redis < Base
       def save
         data = {
-          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S %Z"),
+          :failed_at => Time.now.rfc2822,
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => UTF8Util.clean(exception.to_s),
@@ -31,7 +31,7 @@ def self.clear
 
       def self.requeue(index)
         item = all(index)
-        item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+        item['retried_at'] = Time.now.rfc2822
         Resque.redis.lset(:failed, index, Resque.encode(item))
         Job.create(item['queue'], item['payload']['class'], *item['payload']['args'])
       end
@@ -43,8 +43,12 @@ def self.remove(index)
       end
 
       def filter_backtrace(backtrace)
-        index = backtrace.index { |item| item.include?('/lib/resque/job.rb') }
-        backtrace.first(index.to_i)
+        index = backtrace.index { |item| item.include?('/lib/resque/job.rb') }.to_i
+        if index == 0
+          backtrace
+        else
+          backtrace.first(index.to_i)
+        end
       end
     end
   end

lib/resque/failure/redis.rb

@@ -111,7 +111,7 @@ def perform
 
       begin
         # Execute before_perform hook. Abort the job gracefully if
-        # Resque::DontPerform is raised.
+        # Resque::Job::DontPerform is raised.
         begin
           before_hooks.each do |hook|
             job.send(hook, *job_args)
@@ -166,6 +166,13 @@ def payload_class
       @payload_class ||= constantize(@payload['class'])
     end
 
+    # returns true if payload_class does not raise NameError
+    def has_payload_class?
+      payload_class != Object
+    rescue NameError
+      false
+    end
+
     # Returns an array of args represented in this job's payload.
     def args
       @payload['args']
@@ -174,7 +181,7 @@ def args
     # Given an exception object, hands off the needed parameters to
     # the Failure module.
     def fail(exception)
-      run_failure_hooks(exception)
+      run_failure_hooks(exception) if has_payload_class?
       Failure.create \
         :payload   => payload,
         :exception => exception,

lib/resque/job.rb

@@ -46,11 +46,15 @@ def pop(non_block = false)
         end
       else
         queue_names = @queues.map {|queue| queue.redis_name }
-        synchronize do
-          value = @redis.blpop(*(queue_names + [1])) until value
-          queue_name, payload = value
-          queue = @queue_hash[queue_name]
-          [queue, queue.decode(payload)]
+        if queue_names.any?
+          synchronize do
+            value = @redis.blpop(*(queue_names + [1])) until value
+            queue_name, payload = value
+          queue = @queue_hash["#{@redis.namespace}:#{queue_name}"]
+            [queue, queue.decode(payload)]
+          end
+        else
+          Kernel.sleep # forever
         end
       end
     end
@@ -61,12 +65,17 @@ def pop(non_block = false)
     # the timeout expires.
     def poll(timeout)
       queue_names = @queues.map {|queue| queue.redis_name }
-      queue_name, payload = @redis.blpop(*(queue_names + [timeout]))
-      return unless payload
+      if queue_names.any?
+        queue_name, payload = @redis.blpop(*(queue_names + [timeout]))
+        return unless payload
 
-      synchronize do
-        queue = @queue_hash[queue_name]
-        [queue, queue.decode(payload)]
+        synchronize do
+          queue = @queue_hash["#{@redis.namespace}:#{queue_name}"]
+          [queue, queue.decode(payload)]
+        end
+      else
+        Kernel.sleep(timeout)
+        nil
       end
     end
   end

lib/resque/multi_queue.rb

@@ -14,11 +14,7 @@ class Server < Sinatra::Base
 
     set :views,  "#{dir}/server/views"
 
-    if respond_to? :public_folder
-      set :public_folder, "#{dir}/server/public"
-    else
-      set :public, "#{dir}/server/public"
-    end
+    set :public_folder, "#{dir}/server/public"
 
     set :static, true
 
@@ -30,6 +26,10 @@ def current_section
         url_path request.path_info.sub('/','').split('/')[0].downcase
       end
 
+      def current_subtab
+        url_path request.path_info.sub('/','').split('/')[0, 2].join('/').downcase
+      end
+
       def current_page
         url_path request.path_info.sub('/','')
       end
@@ -44,7 +44,7 @@ def path_prefix
       end
 
       def class_if_current(path = '')
-        'class="current"' if current_page[0, path.size] == path
+        'class="current"' if [current_section, current_subtab].include?(path)
       end
 
       def tab(name)

lib/resque/server.rb

@@ -35,9 +35,9 @@ $(function() {
     return false
   })
 
-  $('a[rel=poll]').click(function() {
-    var href = $(this).attr('href')
-    $(this).parent().text('Starting...')
+  var poll_start = function(el) {
+    var href = el.attr('href')
+    el.parent().text('Starting...')
     $("#main").addClass('polling')
 
     setInterval(function() {
@@ -47,8 +47,14 @@ $(function() {
       }})
     }, poll_interval * 1000)
 
+    location.hash = '#poll'
+
     return false
-  })
+  };
+
+  if (location.hash == '#poll') poll_start($('a[rel=poll]'))
+
+  $('a[rel=poll]').click(function() { return poll_start($(this)) })
 
   $('ul.failed li').hover(function() {
     $(this).addClass('hover');
@@ -69,5 +75,11 @@ $(function() {
     return false;
   })
 
+  $('#clear-failed-jobs').click(function(){
+    return confirm('Are you sure you want to clear ALL failed jobs?');
+  })
 
-})
+  $('#retry-failed-jobs').click(function(){
+    return confirm('Are you sure you want to retry ALL failed jobs?');
+  })
+})

lib/resque/server/public/ranger.js

@@ -74,7 +74,7 @@ body { padding:0; margin:0; }
 #main ul.failed li dl dd .controls { display:none; float:right; }
 #main ul.failed li.hover dl dd .controls { display:block; }
 #main ul.failed li dl dd code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap;}
-#main ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; }
+#main ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre }
 #main ul.failed li dl dd.error pre { margin-top:3px; line-height:1.3;}
 
 #main p.pagination { background:#efefef; padding:10px; overflow:hidden;}