scotttam-resque 0.0.2 → 0.0.3

data/lib/resque/helpers.rb

@@ -10,6 +10,11 @@ module Resque
     def before_fork
       Resque.before_fork  
     end
+
+    #Direct access to the after_fork proc
+    def after_fork
+      Resque.after_fork  
+    end
  
     # Given a Ruby object, returns a string suitable for storage in a
     # queue.

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '0.0.2'
+  Version = '0.0.3'
 end

data/lib/resque/worker.rb

@@ -61,11 +61,6 @@ module Resque
       redis.sismember(:workers, worker_id)
     end
 
-    #Sets the before_hook proc
-    def self.before_fork=(before_fork)
-      @@before_fork = before_fork
-    end
-
     # Workers should be initialized with an array of string queue
     # names. The order is important: a Worker will check the first
     # queue given for a job. If none is found, it will check the
@@ -147,6 +142,7 @@ module Resque
       return unless job ||= reserve
 
       begin
+        call_after_fork
         working_on job
         job.perform
       rescue Object => e
@@ -317,6 +313,11 @@ module Resque
       before_fork.call if before_fork
     end
 
+    #Call any before_fork procs, if any
+    def call_after_fork
+      after_fork.call if after_fork
+    end
+
     # Unregisters ourself as a worker. Useful when shutting down.
     def unregister_worker
       redis.srem(:workers, self)

data/lib/resque.rb

@@ -58,6 +58,16 @@ module Resque
     @before_fork
   end
 
+  #Set a proc that will be called after the worker forks
+  def after_fork=(after_fork)
+    @after_fork = after_fork
+  end
+
+  #Returns the after_fork proc
+  def after_fork
+    @after_fork
+  end
+
   def to_s
     "Resque Client connected to #{redis.server}"
   end

data/test/worker_test.rb

@@ -119,7 +119,7 @@ context "Resque::Worker" do
       worker_id = Resque.workers[0].to_s
       Resque.remove_worker(worker_id)
       assert_equal [], Resque.workers
-   end
+    end
   end
 
   test "records what it is working on" do
@@ -241,20 +241,29 @@ context "Resque::Worker" do
     assert_equal 1, Resque.info[:processed]
   end
 
-  test "Will call a pre-fork proc when the worker starts if set in the initializer only once" do
+  test "Will call a before_fork proc when the worker starts if set in the initializer only once" do
+    Resque.redis.flush_all
     $BEFORE_FORK_CALLED = false
     Resque.before_fork = Proc.new { $BEFORE_FORK_CALLED = true }
-    Resque::Worker.before_fork = Resque.before_fork
     workerA = Resque::Worker.new(:jobs)
     Resque::Job.create(:jobs, SomeJob, 20, '/tmp')
-    
+
     assert !$BEFORE_FORK_CALLED
     workerA.work(0)
     assert $BEFORE_FORK_CALLED
-    
-    $BEFORE_FORK_CALLED = false
+    Resque.before_fork = nil
+  end
+
+  test "Will call a after_fork proc after the worker has successfully forked" do
+    Resque.redis.flush_all
+    $AFTER_FORK_CALLED = false
+    Resque.after_fork = Proc.new { $AFTER_FORK_CALLED = true }
+    workerA = Resque::Worker.new(:jobs)
+
+    assert !$AFTER_FORK_CALLED
     Resque::Job.create(:jobs, SomeJob, 20, '/tmp')
-    assert !$BEFORE_FORK_CALLED
-    Resque::Worker.send(:remove_class_variable, :@@before_fork)
+    workerA.work(0)
+    assert $AFTER_FORK_CALLED
+    Resque.after_fork = nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scotttam-resque
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Wanstrath, Scott Tamosunas