resque 1.1.0 → 1.2.0

data/.gitignore

@@ -0,0 +1,2 @@
+*.gemspec
+pkg

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 1.2.0 (2009-11-25)
+
+* If USR1 is sent and no child is found, shutdown.
+* Raise when a job class does not respond to `perform`.
+* Added `Resque.remove_queue` for deleting a queue
+
 ## 1.1.0 (2009-11-04)
 
 * Bugfix: Broken ERB tag in failure UI

data/README.markdown

@@ -17,7 +17,7 @@ comprised of three parts:
 3. A Sinatra app for monitoring queues, jobs, and workers.
 
 Resque workers can be distributed between multiple machines,
-support priorities, are resililent to memory bloat / "leaks," are
+support priorities, are resilient to memory bloat / "leaks," are
 optimized for REE (but work on MRI and JRuby), tell you what they're
 doing, and expect failure.
 
@@ -151,12 +151,12 @@ do this:
 This is why our above example (and all the examples in `examples/`)
 uses object IDs instead of passing around the objects.
 
-While this is less convenient than just sticking a marshalled object
+While this is less convenient than just sticking a marshaled object
 in the database, it gives you a slight advantage: your jobs will be
 run against the most recent version of an object because they need to
 pull from the DB or cache.
 
-If your jobs were run against marshalled objects, they could
+If your jobs were run against marshaled objects, they could
 potentially be operating on a stale record with out-of-date information.
 
 
@@ -184,7 +184,7 @@ exceptions you would not normally throw in order to assist debugging.
 Workers
 -------
 
-Resque workers are rake tasks the run forever. They basically do this:
+Resque workers are rake tasks that run forever. They basically do this:
 
     start
     loop do
@@ -225,7 +225,7 @@ We don't want the `git_timeout` as high as 10 minutes in our web app,
 but in the Resque workers it's fine.
 
 
-## Logging
+### Logging
 
 Workers support basic logging to STDOUT. If you start them with the
 `VERBOSE` env variable set, they will print basic debugging
@@ -354,10 +354,17 @@ Resque workers respond to a few different signals:
 If you want to gracefully shutdown a Resque worker, use `QUIT`.
 
 If you want to kill a stale or stuck child, use `USR1`. Processing
-will continue as normal.
+will continue as normal unless the child was not found. In that case
+Resque assumes the parent process is in a bad state and shuts down.
 
 If you want to kill a stale or stuck child and shutdown, use `TERM`
 
+### Mysql::Error: MySQL server has gone away
+
+If your workers remain idle for too long they may lose their MySQL
+connection. If that happens we recommend using [this
+Gist](http://gist.github.com/238999).
+
 
 The Front End
 -------------
@@ -367,7 +374,7 @@ your queue.
 
 ![The Front End](http://img.skitch.com/20091104-tqh5pgkwgbskjbk7qbtmpesnyw.jpg)
 
-## Standalone
+### Standalone
 
 If you've installed Resque as a gem running the front end standalone is easy:
 
@@ -419,7 +426,7 @@ over the other?
 * Resque can only place JSONable Ruby objects on a queue as arguments
 * DelayedJob can place _any_ Ruby object on its queue as arguments
 * Resque includes a Sinatra app for monitoring what's going on
-* DelayedJob can be queryed from within your Rails app if you want to
+* DelayedJob can be queried from within your Rails app if you want to
   add an interface
 
 If you're doing Rails development, you already have a database and
@@ -643,7 +650,7 @@ correctly (though we make an effort to tell you if we feel this is the
 case). The tests attempt to start an isolated instance of Redis to
 run against.
 
-Also make sure you've installed all the depenedencies correctly. For
+Also make sure you've installed all the dependencies correctly. For
 example, try loading the `redis-namespace` gem after you've installed
 it:
 
@@ -665,10 +672,10 @@ Contributing
 
 Once you've made your great commits:
 
-1. [Fork](fk) Resque
+1. [Fork][1] Resque
 2. Create a topic branch - `git checkout -b my_branch`
 3. Push to your branch - `git push origin my_branch`
-4. Create an [Issue](is) with a link to your branch
+4. Create an [Issue][2] with a link to your branch
 5. That's it!
 
 
@@ -690,6 +697,7 @@ Meta
 * Docs: <http://defunkt.github.com/resque/>
 * Bugs: <http://github.com/defunkt/resque/issues>
 * List: <resque@librelist.com>
+* Chat: <irc://irc.freenode.net/resque>
 * Gems: <http://gemcutter.org/gems/resque>
 
 
@@ -699,5 +707,5 @@ Author
 Chris Wanstrath :: chris@ozmm.org :: @defunkt
 
 [0]: http://github.com/blog/542-introducing-resque
-[fk]: http://help.github.com/forking/
-[is]: http://github.com/defunkt/resque/issues
+[1]: http://help.github.com/forking/
+[2]: http://github.com/defunkt/resque/issues

data/Rakefile

@@ -1,6 +1,6 @@
-eval File.read('tasks/redis.rake')
+load 'tasks/redis.rake'
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+$LOAD_PATH.unshift 'lib'
 require 'resque/tasks'
 
 task :default => :test
@@ -27,7 +27,6 @@ task :gem => [ :test, :gemspec, :build ]
 
 begin
   require 'jeweler'
-  $LOAD_PATH.unshift 'lib'
   require 'resque/version'
 
   Jeweler::Tasks.new do |gemspec|
@@ -37,7 +36,11 @@ begin
     gemspec.email = "chris@ozmm.org"
     gemspec.homepage = "http://github.com/defunkt/resque"
     gemspec.authors = ["Chris Wanstrath"]
-    gemspec.version = Resque::Version 
+    gemspec.version = Resque::Version
+
+    gemspec.add_dependency "redis"
+    gemspec.add_dependency "redis-namespace"
+    gemspec.add_development_dependency "jeweler"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: "

data/lib/resque.rb

@@ -100,6 +100,14 @@ module Resque
     redis.smembers(:queues)
   end
 
+  # Given a queue name, completely deletes the queue.
+  def remove_queue(queue)
+    @watched_queues ||= {}
+    @watched_queues.delete(queue.to_s)
+    redis.srem(:queues, queue.to_s)
+    redis.del("queue:#{queue}")
+  end
+
   # Used internally to keep track of which queues we've created.
   # Don't call this directly.
   def watch_queue(queue)

data/lib/resque/job.rb

@@ -58,7 +58,6 @@ module Resque
     # Calls #perform on the class given in the payload with the
     # arguments given in the payload.
     def perform
-      return unless payload_class && payload_class.respond_to?(:perform)
       args ? payload_class.perform(*args) : payload_class.perform
     end
 

data/lib/resque/server/public/ranger.js

@@ -1,4 +1,7 @@
+var poll_interval = 2;
+
 $(function() {
+
   $('.time').relatizeDate()
   $('.backtrace').click(function() {
     $(this).next().toggle()
@@ -14,7 +17,7 @@ $(function() {
         $('#main').html(data) 
         $('#main .time').relatizeDate()
       }})
-    }, 2 * 1000)
+    }, poll_interval * 1000)
     return false
   })
     

data/lib/resque/tasks.rb

@@ -2,9 +2,11 @@
 # will give you the resque tasks
 
 namespace :resque do
+  task :setup
+
   desc "Start a Resque Ranger"
-  task :work do
-    Rake::Task['resque:setup'].invoke rescue nil
+  task :work => :setup do
+    require 'resque'
 
     worker = nil
     queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.1.0'
+  Version = '1.2.0'
 end

data/lib/resque/worker.rb

@@ -245,7 +245,12 @@ module Resque
     def kill_child
       if @child
         log! "Killing child at #{@child}"
-        Process.kill("KILL", @child) rescue nil
+        if system("ps -ho pid,state -p #{@child}")
+          Process.kill("KILL", @child) rescue nil
+        else
+          log! "Child #{@child} not found, restarting."
+          shutdown
+        end
       end
     end
 
@@ -383,7 +388,7 @@ module Resque
     # Returns an array of string pids of all the other workers on this
     # machine. Useful when pruning dead workers on startup.
     def worker_pids
-      `ps -e -o pid,command | grep [r]esque`.split("\n").map do |line|
+      `ps -A -o pid,command | grep [r]esque`.split("\n").map do |line|
         line.split(' ')[0]
       end
     end

data/test/resque_test.rb

@@ -118,6 +118,14 @@ context "Resque" do
     assert_equal [], Resque.queues
   end
 
+  test "can delete a queue" do
+    Resque.push(:cars, { 'make' => 'bmw' })
+    assert_equal %w( cars people ), Resque.queues
+    Resque.remove_queue(:people)
+    assert_equal %w( cars ), Resque.queues
+    assert_equal nil, Resque.pop(:people)
+  end
+
   test "keeps track of resque keys" do
     assert_equal ["queue:people", "queues"], Resque.keys
   end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ require 'resque'
 # make sure we can run redis
 #
 
-if `which redis-server`.chomp.empty?
+if !system("which redis-server")
   puts '', "** can't find `redis-server` in your path"
   puts "** try running `sudo rake install`"
   abort ''

data/test/worker_test.rb

@@ -91,6 +91,15 @@ context "Resque::Worker" do
     end
   end
 
+  test "fails if a job class has no `perform` method" do
+    worker = Resque::Worker.new(:perform_less)
+    Resque::Job.create(:perform_less, Object)
+
+    assert_equal 0, Resque::Failure.count
+    worker.work(0)
+    assert_equal 1, Resque::Failure.count
+  end
+
   test "inserts itself into the 'workers' list on startup" do
     @worker.work(0) do
       assert_equal @worker, Resque.workers[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,10 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2009-11-25 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: redis
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: redis-namespace
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: ""
 email: chris@ozmm.org
 executables: 
@@ -24,6 +53,7 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .gitignore
 - .kick
 - HISTORY.md
 - LICENSE