Merge branch 'master' into hook-plugin

Author: defunkt

CONTRIBUTORS

@@ -1,28 +1,32 @@
 * Chris Wanstrath
 * gravis
-* John Barnette
 * scotttam
+* John Barnette
+* Mike Mangino
+* Rob Hanlon
+* Jason Amster
 * Aaron Quint
 * Adam Cooke
 * Ashley Martens
-* Jason Amster
-* Mike Mangino
-* Rob Hanlon
-* jgeiger
-* Roman Heinrich
-* Thibaut Barrère
 * Matt Duncan
+* Michael Dwan
 * Daniel Ceballos
-* Ben VandenBos
-* Christos Trochalakis
-* Roland Moriz
+* Roman Heinrich
+* Thibaut Barrère
+* jgeiger
 * Simon Rozet
-* Brian P O'Rourke
-* PJ Hyett
+* Dave Hoover
+* Christos Trochalakis
+* Ben VandenBos
+* snusnu
+* Arthur Zapparoli
 * Ben Marini
+* Brian P O'Rourke
+* Jim Remsik and Les Hill
 * Karel Minarik
+* Luc Castera
 * Masatomo Nakano
 * Matt Palmer
-* Michael Dwan
-* Dave Hoover
-* Arthur Zapparoli
+* PJ Hyett
+* Roland Moriz
+* malomalo

HISTORY.md

@@ -1,11 +1,14 @@
-## 1.6.1 (2010-??-??)
+## 1.6.1 (2010-03-25)
 
 * Bugfix: Workers may not be clearing their state correctly on
   shutdown
 * Added example monit config.
 * Exception class is now recorded when an error is raised in a
   worker.
-* resque-web: Unit tests
+* web: Unit tests
+* web: Show namespace in header and footer
+* web: Remove a queue
+* web: Retry failed jobs
 
 ## 1.6.0 (2010-03-09)
 

README.markdown

@@ -485,6 +485,8 @@ tool that's best for your app.
 Installing Redis
 ----------------
 
+Resque requires Redis 0.900 or higher.
+
 Resque uses Redis' lists for its queues. It also stores worker state
 data in Redis.
 
@@ -529,6 +531,9 @@ Resque Dependencies
 If you cannot install `yajl-ruby` (JRuby?), you can install the `json`
 gem and Resque will use it instead.
 
+When problems arise, make sure you have the newest versions of the
+`redis` and `redis-namespace` gems.
+
 
 Installing Resque
 -----------------
@@ -655,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 ONCE BEFORE THE WORKER FORKS THE FIRST TIME"
+      puts "Call me before the worker forks"
     end
 
 The `before_fork` hook will be run in the **parent** process. So, be
@@ -671,7 +676,7 @@ the worker.
 And after forking:
 
     Resque.after_fork do |job|
-      puts "CALL ME ONCE BEFORE THE WORKER FORKS THE FIRST TIME"
+      puts "Call me after the worker forks"
     end
 
 The `after_fork` hook will be run in the child process and is passed
@@ -714,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
 -----------

examples/demo/Rakefile

@@ -1,3 +1,8 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 require 'resque/tasks'
 require 'job'
+
+desc "Start the demo using `rackup`"
+task :start do 
+  exec "rackup config.ru"
+end

lib/resque/failure.rb

@@ -59,5 +59,8 @@ def self.clear
       backend.clear
     end
 
+    def self.requeue(index)
+      backend.requeue(index)
+    end
   end
 end

lib/resque/failure/base.rb

@@ -48,6 +48,9 @@ def self.url
       # Clear all failure objects
       def self.clear
       end
+      
+      def self.requeue(index)
+      end
 
       # Logging!
       def log(message)

lib/resque/failure/hoptoad.rb

@@ -8,6 +8,8 @@ module Failure
     #
     # To use it, put this code in an initializer, Rake task, or wherever:
     #
+    #   require 'resque/failure/hoptoad'
+    #
     #   Resque::Failure::Hoptoad.configure do |config|
     #     config.api_key = 'blah'
     #     config.secure = true

lib/resque/failure/redis.rb

@@ -29,6 +29,12 @@ def self.clear
         Resque.redis.del(:failed)
       end
 
+      def self.requeue(index)
+        item = all(index)
+        item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+        Resque.redis.lset(:failed, index, Resque.encode(item))
+        Job.create(item['queue'], item['payload']['class'], *item['payload']['args'])
+      end
     end
   end
 end

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)
@@ -124,6 +124,11 @@ def show(page, layout = true)
         show page
       end
     end
+    
+    post "/queues/:id/remove" do
+      Resque.remove_queue(params[:id])
+      redirect u('queues')
+    end
 
     %w( overview workers ).each do |page|
       get "/#{page}.poll" do
@@ -145,6 +150,15 @@ def show(page, layout = true)
       Resque::Failure.clear
       redirect u('failed')
     end
+    
+    get "/failed/requeue/:index" do
+      Resque::Failure.requeue(params[:index])
+      if request.xhr?
+        return Resque::Failure.all(params[:index])['retried_at']
+      else
+        redirect u('failed')
+      end
+    end
 
     get "/stats" do
       redirect url("/stats/resque")

lib/resque/server/public/ranger.js

@@ -1,24 +1,67 @@
-var poll_interval = 2;
-
 $(function() {
+  var poll_interval = 2
+
+  var relatizer = function(){
+    var dt = $(this).text(), relatized = $.relatizeDate(this)
+    if ($(this).parents("a").length > 0 || $(this).is("a")) {
+      $(this).relatizeDate()
+      if (!$(this).attr('title')) {
+        $(this).attr('title', dt)
+      }
+    } else {
+      $(this)
+        .text('')
+        .append( $('<a href="#" class="toggle_format" title="' + dt + '" />')
+        .append('<span class="date_time">' + dt +
+                '</span><span class="relatized_time">' +
+                relatized + '</span>') )
+    }
+  };
+
+  $('.time').each(relatizer);
+
+  $('.time a.toggle_format .date_time').hide()
+
+  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);
 
-  $('.time').relatizeDate()
   $('.backtrace').click(function() {
     $(this).next().toggle()
     return false
   })
-  
+
   $('a[rel=poll]').click(function() {
     var href = $(this).attr('href')
     $(this).parent().text('Starting...')
     $("#main").addClass('polling')
+
     setInterval(function() {
-      $.ajax({dataType:'text', type:'get', url:href, success:function(data) { 
-        $('#main').html(data) 
+      $.ajax({dataType: 'text', type: 'get', url: href, success: function(data) {
+        $('#main').html(data)
         $('#main .time').relatizeDate()
       }})
     }, poll_interval * 1000)
+
     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;
+  })
+
+
 })