Move done_working to the parent process

When the child is killed, the redis key isn't removed. We believe the
right way to fix it would be to move all state-related code to the
parent process.

Author: sr

lib/resque/worker.rb

@@ -113,17 +113,19 @@ def work(interval = 5, &block)
         if not @paused and job = reserve
           log "got: #{job.inspect}"
           run_hook :before_fork
+          working_on job
 
           if @child = fork
             rand # Reseeding
             procline "Forked #{@child} at #{Time.now.to_i}"
             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 @@ def work(interval = 5, &block)
       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 @@ def process(job = nil)
         log "done: #{job.inspect}"
       ensure
         yield job if block_given?
-        done_working
       end
     end
 
@@ -347,6 +354,7 @@ 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_s,

test/resque_test.rb

@@ -202,6 +202,7 @@
     @worker = Resque::Worker.new(:jobs)
     @worker.register_worker
     2.times { @worker.process }
+
     job = @worker.reserve
     @worker.working_on job
 

test/test_helper.rb

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