resque 1.7.1 → 1.8.0

data/HISTORY.md

@@ -1,3 +1,13 @@
+## 1.8.0 (2010-04-07)
+
+* Jobs that never complete due to killed worker are now failed.
+* Worker "working" state is now maintained by the parent, not the child.
+* Stopped using deprecated redis.rb methods
+* `Worker.working` race condition fixed
+* `Worker#process` has been deprecated.
+* Monit example fixed
+* Redis::Client and Redis::Namespace can be passed to `Resque.redis=`
+
 ## 1.7.1 (2010-04-02)
 
 * Bugfix: Make job hook execution order consistent

data/docs/PLUGINS.md

@@ -86,8 +86,8 @@ Plugins should test compliance to this document using the
 
 For example:
 
-    def test_lint
-      assert Resque::Plugin.lint(Resque::Plugins::Lock)
+    assert_nothing_raised do
+      Resque::Plugin.lint(Resque::Plugins::Lock)
     end
 
 [sv]: http://semver.org/

data/examples/monit/resque.monit

@@ -1,6 +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
+  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.rb

@@ -26,7 +26,7 @@ module Resque
   # Accepts:
   #   1. A 'hostname:port' string
   #   2. A 'hostname:port:db' string (to select the Redis db)
-  #   3. An instance of `Redis`
+  #   3. An instance of `Redis`, `Redis::Client`, or `Redis::Namespace`.
   def redis=(server)
     case server
     when String
@@ -34,8 +34,10 @@ module Resque
       redis = Redis.new(:host => host, :port => port,
         :thread_safe => true, :db => db)
       @redis = Redis::Namespace.new(:resque, :redis => redis)
-    when Redis
+    when Redis, Redis::Client
       @redis = Redis::Namespace.new(:resque, :redis => server)
+    when Redis::Namespace
+      @redis = server
     else
       raise "I don't know what to do with #{server.inspect}"
     end

data/lib/resque/errors.rb

@@ -4,4 +4,7 @@ module Resque
 
   # Raised when trying to create a job without a class
   class NoClassError < RuntimeError; end
+  
+  # Raised when a worker was killed while processing a job.
+  class DirtyExit < RuntimeError; end
 end

data/lib/resque/stat.rb

@@ -24,7 +24,7 @@ module Resque
     # Can optionally accept a second int parameter. The stat is then
     # incremented by that amount.
     def incr(stat, by = 1)
-      redis.incr("stat:#{stat}", by)
+      redis.incrby("stat:#{stat}", by)
     end
 
     # Increments a stat by one.
@@ -37,7 +37,7 @@ module Resque
     # Can optionally accept a second int parameter. The stat is then
     # decremented by that amount.
     def decr(stat, by = 1)
-      redis.decr("stat:#{stat}", by)
+      redis.decrby("stat:#{stat}", by)
     end
 
     # Decrements a stat by one.

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.7.1'
+  Version = '1.8.0'
 end

data/lib/resque/worker.rb

@@ -35,7 +35,7 @@ module Resque
       names.map! { |name| "worker:#{name}" }
       redis.mapped_mget(*names).keys.map do |key|
         find key.sub("worker:", '')
-      end
+      end.compact
     end
 
     # Returns a single worker object. Accepts a string id.
@@ -113,6 +113,7 @@ module Resque
         if not @paused and job = reserve
           log "got: #{job.inspect}"
           run_hook :before_fork
+          working_on job
 
           if @child = fork
             rand # Reseeding
@@ -120,10 +121,11 @@ module Resque
             Process.wait
           else
             procline "Processing #{job.queue} since #{Time.now.to_i}"
-            process(job, &block)
+            perform(job, &block)
             exit! unless @cant_fork
           end
 
+          done_working
           @child = nil
         else
           break if interval.to_i == 0
@@ -137,15 +139,21 @@ module Resque
       unregister_worker
     end
 
-    # Processes a single job. If none is given, it will try to produce
-    # one.
-    def process(job = nil)
+    # DEPRECATED. Processes a single job. If none is given, it will
+    # try to produce one. Usually run in the child.
+    def process(job = nil, &block)
       return unless job ||= reserve
 
+      working_on job
+      perform(job, &block)
+    ensure
+      done_working
+    end
+
+    # Processes a given job in the child.
+    def perform(job)
       begin
-        job.worker = self
         run_hook :after_fork, job
-        working_on job
         job.perform
       rescue Object => e
         log "#{job.inspect} failed: #{e.inspect}"
@@ -155,7 +163,6 @@ module Resque
         log "done: #{job.inspect}"
       ensure
         yield job if block_given?
-        done_working
       end
     end
 
@@ -326,6 +333,16 @@ module Resque
 
     # Unregisters ourself as a worker. Useful when shutting down.
     def unregister_worker
+      # If we're still processing a job, make sure it gets logged as a
+      # failure.
+      if (hash = processing) && !hash.empty?
+        job = Job.new(hash['queue'], hash['payload'])
+        # Ensure the proper worker is attached to this job, even if
+        # it's not the precise instance that died.
+        job.worker = self
+        job.fail(DirtyExit.new)
+      end
+
       redis.srem(:workers, self)
       redis.del("worker:#{self}")
       redis.del("worker:#{self}:started")
@@ -337,6 +354,7 @@ module Resque
     # 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_s,

data/test/resque_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 context "Resque" do
   setup do
-    Resque.redis.flush_all
+    Resque.redis.flushall
 
     Resque.push(:people, { 'name' => 'chris' })
     Resque.push(:people, { 'name' => 'bob' })
@@ -166,7 +166,7 @@ context "Resque" do
   end
 
   test "queues are always a list" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     assert_equal [], Resque.queues
   end
 
@@ -202,6 +202,7 @@ context "Resque" do
     @worker = Resque::Worker.new(:jobs)
     @worker.register_worker
     2.times { @worker.process }
+
     job = @worker.reserve
     @worker.working_on job
 
@@ -217,7 +218,7 @@ context "Resque" do
     assert_equal 1, stats[:failed]
     assert_equal ['localhost:9736'], stats[:servers]
   end
-  
+
   test "decode bad json" do
     assert_nil Resque.decode("{\"error\":\"Module not found \\u002\"}")
   end

data/test/test_helper.rb

@@ -108,4 +108,4 @@ class BadJobWithSyntaxError
   def self.perform
     raise SyntaxError, "Extra Bad job!"
   end
-end
+end

data/test/worker_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 context "Resque::Worker" do
   setup do
-    Resque.redis.flush_all
+    Resque.redis.flushall
 
     Resque.before_first_fork = nil
     Resque.before_fork = nil
@@ -18,13 +18,20 @@ context "Resque::Worker" do
     assert_equal 1, Resque::Failure.count
   end
 
-  test "failed jobs report excpetion and message" do
+  test "failed jobs report exception 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 "fails uncompleted jobs on exit" do
+    job = Resque::Job.new(:jobs, [GoodJob, "blah"])
+    @worker.working_on(job)
+    @worker.unregister_worker
+    assert_equal 1, Resque::Failure.count
+  end
+
   test "can peek at failed jobs" do
     10.times { Resque::Job.create(:jobs, BadJob) }
     @worker.work(0)
@@ -253,7 +260,7 @@ context "Resque::Worker" do
   end
 
   test "Will call a before_first_fork hook only once" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $BEFORE_FORK_CALLED = 0
     Resque.before_first_fork = Proc.new { $BEFORE_FORK_CALLED += 1 }
     workerA = Resque::Worker.new(:jobs)
@@ -270,7 +277,7 @@ context "Resque::Worker" do
   end
 
   test "Will call a before_fork hook before forking" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $BEFORE_FORK_CALLED = false
     Resque.before_fork = Proc.new { $BEFORE_FORK_CALLED = true }
     workerA = Resque::Worker.new(:jobs)
@@ -282,7 +289,7 @@ context "Resque::Worker" do
   end
 
   test "Will call an after_fork hook after forking" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $AFTER_FORK_CALLED = false
     Resque.after_fork = Proc.new { $AFTER_FORK_CALLED = true }
     workerA = Resque::Worker.new(:jobs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency