resque 1.6.0 → 1.6.1

data/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

data/HISTORY.md

@@ -1,3 +1,15 @@
+## 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.
+* web: Unit tests
+* web: Show namespace in header and footer
+* web: Remove a queue
+* web: Retry failed jobs
+
 ## 1.6.0 (2010-03-09)
 
 * Added `before_first_fork`, `before_fork`, and `after_fork` hooks.

data/README.markdown

@@ -648,6 +648,9 @@ this way we can tell our Sinatra app about the config file:
 
 Now everyone is on the same page.
 
+Worker Hooks
+------------
+
 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:
 
@@ -658,7 +661,7 @@ first time, you can add it in the initializer like so:
 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
@@ -668,7 +671,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
@@ -679,6 +682,7 @@ All hooks can also be set using a setter, e.g.
 
     Resque.after_fork = proc { puts "called" }
 
+
 Namespaces
 ----------
 
@@ -797,4 +801,4 @@ Chris Wanstrath :: chris@ozmm.org :: @defunkt
 [2]: http://github.com/defunkt/resque/issues
 [sv]: http://semver.org/
 [rs]: http://github.com/defunkt/redis-namespace
-[cb]: http://wiki.github.com/defunkt/resque/contributing
+[cb]: http://wiki.github.com/defunkt/resque/contributing

data/deps.rip

@@ -3,4 +3,5 @@ git://github.com/brianmario/yajl-ruby.git 0.6.3
 git://github.com/sinatra/sinatra.git 0.9.4
 git://github.com/rack/rack.git 1.0
 git://github.com/quirkey/vegas.git v0.1.2
+git://github.com/brynary/rack-test.git v0.5.3
 rake

data/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

data/examples/monit/resque.monit

@@ -0,0 +1,6 @@
+check process resque_worker_QUEUE
+  with pidfile /data/APP_NAME/current/tmp/pids/resque_worker_QUEUE.pid
+  start program = "/bin/sh -c 'cd /data/APP_NAME/current; RAILS_ENV=production QUEUE=queue_name VERBOSE=1 nohup rake resque:work &> log/resque_worker_QUEUE.log && echo $! > tmp/pids/resque_worker_QUEUE.pid'" as uid deploy and gid deploy
+  stop program = "/bin/sh -c 'cd /data/APP_NAME/current && kill -s QUIT `cat tmp/pids/resque_worker_QUEUE.pid` && rm -f tmp/pids/resque_worker_QUEUE.pid; exit 0;'"
+  if totalmem is greater than 300 MB for 10 cycles then restart  # eating up memory?
+  group resque_workers

data/lib/resque/failure.rb

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

data/lib/resque/failure/base.rb

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

data/lib/resque/failure/hoptoad.rb

@@ -8,6 +8,8 @@ module Resque
     #
     # 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

data/lib/resque/failure/redis.rb

@@ -7,6 +7,7 @@ module Resque
         data = {
           :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S"),
           :payload   => payload,
+          :exception => exception.class.to_s,
           :error     => exception.to_s,
           :backtrace => exception.backtrace,
           :worker    => worker.to_s,
@@ -28,6 +29,12 @@ module Resque
         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

data/lib/resque/server.rb

@@ -124,6 +124,11 @@ module Resque
         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,11 @@ module Resque
       Resque::Failure.clear
       redirect u('failed')
     end
+    
+    get "/failed/requeue/:index" do
+      Resque::Failure.requeue(params[:index])
+      redirect u('failed')
+    end
 
     get "/stats" do
       redirect url("/stats/resque")

data/lib/resque/server/public/style.css

@@ -8,6 +8,8 @@ body { padding:0; margin:0; }
 .header ul li a:hover { background:#333;}
 .header ul li.current a { background:#ce1212; font-weight:bold; color:#fff;}
 
+.header .namespace { position: absolute; right: 75px; top: 10px; color: #7A7A7A; }
+
 .subnav { padding:2px 5% 7px 5%; background:#ce1212; font-size:90%;}
 .subnav li { display:inline;}
 .subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#dd5b5b; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
@@ -65,6 +67,7 @@ body { padding:0; margin:0; }
 #main ul.failed li {background:-webkit-gradient(linear, left top, left bottom, from(#efefef), to(#fff)) #efefef; margin-top:10px; padding:10px; overflow:hidden; -webkit-border-radius:5px; border:1px solid #ccc; }
 #main ul.failed li dl dt {font-size:80%; color:#999; width:60px; float:left; padding-top:1px; text-align:right;}
 #main ul.failed li dl dd {margin-bottom:10px; margin-left:70px;}
+#main ul.failed li dl dd .retry { float: right; }
 #main ul.failed li dl dd code, #main ul.failed li dl dd pre { 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%; }
 #main ul.failed li dl dd.error pre { margin-top:3px; line-height:1.3;}
@@ -73,4 +76,4 @@ body { padding:0; margin:0; }
 #main p.pagination a.less { float:left;}
 #main p.pagination a.more { float:right;}
 
-#main form.clear-failed {float:right; margin-top:-10px;}
+#main form {float:right; margin-top:-10px;}

data/lib/resque/server/test_helper.rb

@@ -0,0 +1,19 @@
+require 'rack/test'
+require 'resque/server'
+
+module Resque
+  module TestHelper
+    class Test::Unit::TestCase
+      include Rack::Test::Methods
+      def app 
+        Resque::Server.new
+      end 
+
+      def self.should_respond_with_success
+        test "should respond with success" do
+          assert last_response.ok?
+        end 
+      end 
+    end
+  end
+end

data/lib/resque/server/views/failed.erb

@@ -1,5 +1,6 @@
 <%start = params[:start].to_i %>
 <%failed = Resque::Failure.all(start, 20)%>
+<% index = 0 %>
 
 <h1>Failed Jobs</h1>
 <%unless failed.empty?%>
@@ -12,18 +13,30 @@
 
 <ul class='failed'>
   <%for job in failed%>
+    <% index += 1 %>
     <li>
       <dl>
         <dt>Worker</dt>
-        <dd><a href="<%= url(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b></dd>
+        <dd>
+          <a href="<%= url(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b>
+          <div class='retry'>
+            <% 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>
+            <% end %>
+          </div>
+        </dd>
         <dt>Class</dt>
         <dd><code><%= job['payload']['class'] %></code></dd>
         <dt>Arguments</dt>
         <dd><pre><%=h show_args(job['payload']['args']) %></pre></dd>
+        <dt>Exception</td>
+        <dd><code><%= job['exception'] %></code></dd>
         <dt>Error</dt>
         <dd class='error'>
           <a href="#" class="backtrace"><%= h(job['error']) %></a>
-          <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>          
+          <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
         </dd>
       </dl>
       <div class='r'>

data/lib/resque/server/views/layout.erb

@@ -1,11 +1,12 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
+  <meta charset="utf-8" />
   <title>Resque.</title>
   <link href="<%=u 'reset.css' %>" media="screen" rel="stylesheet" type="text/css">
   <link href="<%=u 'style.css' %>" media="screen" rel="stylesheet" type="text/css">
-  <script src="<%=u 'jquery-1.3.2.min.js' %>" type="text/javascript"</script>
-  <script src="<%=u 'jquery.relatize_date.js' %>" type="text/javascript"</script>  
+  <script src="<%=u 'jquery-1.3.2.min.js' %>" type="text/javascript"></script>
+  <script src="<%=u 'jquery.relatize_date.js' %>" type="text/javascript"></script>
   <script src="<%=u 'ranger.js' %>" type="text/javascript"></script>
 </head>
 <body>
@@ -15,8 +16,13 @@
         <%= tab tab_name %>
       <% end %>
     </ul>
+    <% if Resque.redis.namespace != :resque %>
+      <abbr class="namespace" title="Resque's Redis Namespace">
+       <%= Resque.redis.namespace %>
+      </abbr>
+    <% end %>
   </div>
-  
+
   <% if @subtabs %>
     <ul class='subnav'>
       <% for subtab in @subtabs %>
@@ -24,14 +30,14 @@
       <% end %>
     </ul>
   <% end %>
-  
+
 <div id="main">
   <%= yield %>
 </div>
 
 <div id="footer">
   <p>Powered by <a href="http://github.com/defunkt/resque">Resque</a> v<%=Resque::Version%></p>
-  <p>Connected to Redis on <%=Resque.redis.server%></p>
+  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis.server%></p>
 </div>
 
 </body>

data/lib/resque/server/views/queues.erb

@@ -3,6 +3,9 @@
 <% if queue = params[:id] %>
 
   <h1>Pending jobs on <span class='hl'><%= queue %></span></h1>
+  <form method="POST" action="<%=u "/queues/#{queue}/remove" %>" class='remove-queue'>
+    <input type='submit' name='' value='Remove Queue' />
+  </form>
   <p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque.size(queue)%></b> jobs</p>
   <table class='jobs'>
     <tr>

data/lib/resque/server/views/workers.erb

@@ -18,7 +18,7 @@
       <% host, pid, queues = worker.to_s.split(':') %>
       <td><%= host %></td>
       <td><%= pid %></td>
-      <td><span class="time"><%= worker.started %></a></td>
+      <td><span class="time"><%= worker.started %></span></td>
       <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
       <td><%= worker.processed %></td>
       <td><%= worker.failed %></td>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.6.0'
+  Version = '1.6.1'
 end

data/lib/resque/worker.rb

@@ -322,6 +322,7 @@ module Resque
     # Unregisters ourself as a worker. Useful when shutting down.
     def unregister_worker
       redis.srem(:workers, self)
+      redis.del("worker:#{self}")
       redis.del("worker:#{self}:started")
 
       Stat.clear("processed:#{self}")

data/tasks/redis.rake

@@ -1,20 +1,28 @@
 # Inspired by rabbitmq.rake the Redbox project at http://github.com/rick/redbox/tree/master
 require 'fileutils'
 require 'open-uri'
+require 'pathname'
 
 class RedisRunner
 
-  def self.redisdir
-    "/tmp/redis/"
+  def self.redis_dir
+    @redis_dir ||= if ENV['PREFIX']
+                     Pathname.new(ENV['PREFIX'])
+                   else
+                     Pathname.new(`which redis-server`) + '..' + '..'
+                   end
   end
 
-  def self.redisconfdir
-    server_dir = File.dirname(`which redis-server`)
-    conf_file = "#{server_dir}/../etc/redis.conf"
-    unless File.exists? conf_file
-      conf_file = "#{server_dir}/../../etc/redis.conf"
-    end
-    conf_file
+  def self.bin_dir
+    redis_dir + 'bin'
+  end
+
+  def self.config
+    @config ||= if File.exists?(redis_dir + 'etc/redis.conf')
+                  redis_dir + 'etc/redis.conf'
+                else
+                  redis_dir + '../etc/redis.conf'
+                end
   end
 
   def self.dtach_socket
@@ -29,12 +37,12 @@ class RedisRunner
   def self.start
     puts 'Detach with Ctrl+\  Re-attach with rake redis:attach'
     sleep 1
-    command = "dtach -A #{dtach_socket} redis-server #{redisconfdir}"
+    command = "#{bin_dir}/dtach -A #{dtach_socket} #{bin_dir}/redis-server #{config}"
     sh command
   end
 
   def self.attach
-    exec "dtach -a #{dtach_socket}"
+    exec "#{bin_dir}/dtach -a #{dtach_socket}"
   end
 
   def self.stop
@@ -73,31 +81,39 @@ namespace :redis do
 
   desc 'Install the latest verison of Redis from Github (requires git, duh)'
   task :install => [:about, :download, :make] do
-    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = '/usr/bin'
+    bin_dir = '/usr/bin'
+    conf_dir = '/etc'
+
+    if ENV['PREFIX']
+      bin_dir = "#{ENV['PREFIX']}/bin"
+      sh "mkdir -p #{bin_dir}" unless File.exists?("#{bin_dir}")
+
+      conf_dir = "#{ENV['PREFIX']}/etc"
+      sh "mkdir -p #{conf_dir}" unless File.exists?("#{conf_dir}")
+    end
+
     %w(redis-benchmark redis-cli redis-server).each do |bin|
       sh "cp /tmp/redis/#{bin} #{bin_dir}"
     end
 
     puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
 
-    ENV['PREFIX'] and conf_dir = "#{ENV['PREFIX']}/etc" or conf_dir = '/etc'
     unless File.exists?("#{conf_dir}/redis.conf")
-      sh "mkdir #{conf_dir}" unless File.exists?("#{conf_dir}")
       sh "cp /tmp/redis/redis.conf #{conf_dir}/redis.conf"
       puts "Installed redis.conf to #{conf_dir} \n You should look at this file!"
     end
   end
 
   task :make do
-    sh "cd #{RedisRunner.redisdir} && make clean"
-    sh "cd #{RedisRunner.redisdir} && make"
+    sh "cd /tmp/redis && make clean"
+    sh "cd /tmp/redis && make"
   end
 
   desc "Download package"
   task :download do
-    sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}/.svn")
-    sh 'git clone git://github.com/antirez/redis.git /tmp/redis' unless File.exists?(RedisRunner.redisdir)
-    sh "cd #{RedisRunner.redisdir} && git pull" if File.exists?("#{RedisRunner.redisdir}/.git")
+    sh 'rm -rf /tmp/redis/' if File.exists?("/tmp/redis/.svn")
+    sh 'git clone git://github.com/antirez/redis.git /tmp/redis' unless File.exists?('/tmp/redis')
+    sh "cd /tmp/redis && git pull" if File.exists?("/tmp/redis/.git")
   end
 
 end
@@ -110,9 +126,24 @@ namespace :dtach do
   end
 
   desc 'Install dtach 0.8 from source'
-  task :install => [:about] do
+  task :install => [:about, :download, :make] do
+
+    bin_dir = "/usr/bin"
+
+    if ENV['PREFIX']
+      bin_dir = "#{ENV['PREFIX']}/bin"
+      sh "mkdir -p #{bin_dir}" unless File.exists?("#{bin_dir}")
+    end
+
+    sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"
+  end
+
+  task :make do
+    sh 'cd /tmp/dtach-0.8/ && ./configure && make'
+  end
 
-    Dir.chdir('/tmp/')
+  desc "Download package"
+  task :download do
     unless File.exists?('/tmp/dtach-0.8.tar.gz')
       require 'net/http'
 
@@ -121,15 +152,8 @@ namespace :dtach do
     end
 
     unless File.directory?('/tmp/dtach-0.8')
-      system('tar xzf dtach-0.8.tar.gz')
+      sh 'cd /tmp && tar xzf dtach-0.8.tar.gz'
     end
-
-    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "/usr/bin"
-    Dir.chdir('/tmp/dtach-0.8/')
-    sh 'cd /tmp/dtach-0.8/ && ./configure && make'
-    sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"
-
-    puts "Dtach successfully installed to #{bin_dir}"
   end
 end
 

data/test/resque-web_test.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'resque/server/test_helper'
+ 
+# Root path test
+context "on GET to /" do
+  setup { get "/" }
+
+  test "redirect to overview" do
+    follow_redirect!
+  end
+end
+
+# Global overview
+context "on GET to /overview" do
+  setup { get "/overview" }
+
+  test "should at least display 'queues'" do
+    assert last_response.body.include?('Queues')
+  end
+end
+
+# Working jobs
+context "on GET to /working" do
+  setup { get "/working" }
+
+  should_respond_with_success
+end
+
+# Failed
+context "on GET to /failed" do
+  setup { get "/failed" }
+
+  should_respond_with_success
+end
+
+# Stats 
+context "on GET to /stats/resque" do
+  setup { get "/stats/resque" }
+
+  should_respond_with_success
+end
+
+context "on GET to /stats/redis" do
+  setup { get "/stats/redis" }
+
+  should_respond_with_success
+end
+
+context "on GET to /stats/resque" do
+  setup { get "/stats/keys" }
+
+  should_respond_with_success
+end
+

data/test/test_helper.rb

@@ -94,3 +94,9 @@ class GoodJob
     "Good job, #{name}"
   end
 end
+
+class BadJobWithSyntaxError
+  def self.perform
+    raise SyntaxError, "Extra Bad job!"
+  end
+end

data/test/worker_test.rb

@@ -17,6 +17,13 @@ context "Resque::Worker" do
     @worker.work(0)
     assert_equal 1, Resque::Failure.count
   end
+  
+  test "failed jobs report excpetion and message" do
+    Resque::Job.create(:jobs, BadJobWithSyntaxError)
+    @worker.work(0)
+    assert_equal('SyntaxError', Resque::Failure.all['exception'])
+    assert_equal('Extra Bad job!', Resque::Failure.all['error'])
+  end
 
   test "can peek at failed jobs" do
     10.times { Resque::Job.create(:jobs, BadJob) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -08:00
+date: 2010-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - examples/god/resque.god
 - examples/god/stale.god
 - examples/instance.rb
+- examples/monit/resque.monit
 - examples/simple.rb
 - init.rb
 - lib/resque.rb
@@ -113,6 +114,7 @@ files:
 - lib/resque/server/public/reset.css
 - lib/resque/server/public/style.css
 - lib/resque/server/public/working.png
+- lib/resque/server/test_helper.rb
 - lib/resque/server/views/error.erb
 - lib/resque/server/views/failed.erb
 - lib/resque/server/views/key_sets.erb
@@ -131,6 +133,7 @@ files:
 - tasks/redis.rake
 - tasks/resque.rake
 - test/redis-test.conf
+- test/resque-web_test.rb
 - test/resque_test.rb
 - test/test_helper.rb
 - test/worker_test.rb
@@ -163,6 +166,7 @@ signing_key:
 specification_version: 3
 summary: ""
 test_files: 
+- test/resque-web_test.rb
 - test/resque_test.rb
 - test/test_helper.rb
 - test/worker_test.rb