Merge branch 'master' into 2.0

Author: defunkt

README.markdown

@@ -660,13 +660,13 @@ If you wish to have a Proc called before the worker forks for the
 first time, you can add it in the initializer like so:
 
     Resque.before_first_fork do
-      puts "CALL ME ONCE BEFORE THE WORKER FORKS THE FIRST TIME"
+      puts "Call me once before the worker forks the first time"
     end
 
 You can also run a hook before _every_ fork:
 
     Resque.before_fork do |job|
-      puts "CALL ME BEFORE THE WORKER FORKS"
+      puts "Call me before the worker forks"
     end
 
 The `before_fork` hook will be run in the **parent** process. So, be
@@ -676,7 +676,7 @@ the worker.
 And after forking:
 
     Resque.after_fork do |job|
-      puts "CALL ME AFTER THE WORKER FORKS"
+      puts "Call me after the worker forks"
     end
 
 The `after_fork` hook will be run in the child process and is passed
@@ -719,10 +719,18 @@ Try it out by looking at the README, found at `examples/demo/README.markdown`.
 Monitoring
 ----------
 
+### god
+
 If you're using god to monitor Resque, we have provided example
 configs in `examples/god/`. One is for starting / stopping workers,
 the other is for killing workers that have been running too long.
 
+### monit
+
+If you're using monit, `examples/monit/resque.monit` is provided free
+of charge. This is **not** used by GitHub in production, so please
+send patches for any tweaks or improvements you can make to it.
+
 
 Development
 -----------

lib/resque/server.rb

@@ -20,7 +20,7 @@ def current_section
       end
 
       def current_page
-        url request.path_info.sub('/','').downcase
+        url request.path_info.sub('/','')
       end
 
       def url(*path_parts)
@@ -153,7 +153,11 @@ def show(page, layout = true)
 
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
-      redirect u('failed')
+      if request.xhr?
+        return Resque::Failure.all(params[:index])['retried_at']
+      else
+        redirect u('failed')
+      end
     end
 
     get "/stats" do

lib/resque/server/public/ranger.js

@@ -1,7 +1,7 @@
 $(function() {
   var poll_interval = 2
 
-  $('.time').each(function(){
+  var relatizer = function(){
     var dt = $(this).text(), relatized = $.relatizeDate(this)
     if ($(this).parents("a").length > 0 || $(this).is("a")) {
       $(this).relatizeDate()
@@ -16,15 +16,19 @@ $(function() {
                 '</span><span class="relatized_time">' +
                 relatized + '</span>') )
     }
-  })
+  };
+
+  $('.time').each(relatizer);
 
   $('.time a.toggle_format .date_time').hide()
 
-  $('.time a.toggle_format').click(function(){
+  var format_toggler = function(){
     $('.time a.toggle_format span').toggle()
     $(this).attr('title', $('span:hidden',this).text())
     return false
-  })
+  };
+
+  $('.time a.toggle_format').click(format_toggler);
 
   $('.backtrace').click(function() {
     $(this).next().toggle()
@@ -45,4 +49,19 @@ $(function() {
 
     return false
   })
+
+  $('ul.failed a[rel=retry]').click(function() {
+    var href = $(this).attr('href');
+    $(this).text('Retrying...');
+    var parent = $(this).parent();
+    $.ajax({dataType: 'text', type: 'get', url: href, success: function(data) {
+      parent.html('Retried <b><span class="time">' + data + '</span></b>');
+      relatizer.apply($('.time', parent));
+      $('.date_time', parent).hide();
+      $('a.toggle_format span', parent).click(format_toggler);
+    }});
+    return false;
+  })
+
+
 })

lib/resque/server/views/failed.erb

@@ -23,7 +23,7 @@
             <% if job['retried_at'] %>
               Retried <b><span class="time"><%= job['retried_at'] %></span></b>
             <% else %>
-              <a href="<%= u "failed/requeue/#{start + index - 1}" %>">Retry</a>
+              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
             <% end %>
           </div>
         </dd>
@@ -46,3 +46,4 @@
 </ul>
 
 <%= partial :next_more, :start => start, :size => size %>
+

lib/resque/worker.rb

@@ -143,6 +143,7 @@ def process(job = nil)
       return unless job ||= reserve
 
       begin
+        job.worker = self
         run_hook :after_fork, job
         working_on job
         job.perform
@@ -332,7 +333,6 @@ def unregister_worker
     # Given a job, tells Redis we're working on it. Useful for seeing
     # what workers are doing and when.
     def working_on(job)
-      job.worker = self
       data = encode \
         :queue   => job.queue,
         :run_at  => Time.now.to_i,