renamed before_fork to before_first_fork.

Author: scotttam

lib/resque.rb

@@ -49,13 +49,13 @@ def redis
   end
 
   #Set a proc that will be called once before the worker forks
-  def before_fork=(before_fork)
-    @before_fork = before_fork
+  def before_first_fork=(before_first_fork)
+    @before_first_fork = before_first_fork
   end
 
-  #Returns the before_fork proc
-  def before_fork
-    @before_fork
+  #Returns the before_first_fork proc
+  def before_first_fork
+    @before_first_fork
   end
 
   #Set a proc that will be called after the worker forks

lib/resque/helpers.rb

@@ -6,9 +6,9 @@ def redis
       Resque.redis
     end
 
-    #Direct access to the before_fork proc
-    def before_fork
-      Resque.before_fork  
+    #Direct access to the before_first_fork proc
+    def before_first_fork
+      Resque.before_first_fork  
     end
 
     #Direct access to the after_fork proc

lib/resque/worker.rb

@@ -203,7 +203,7 @@ def startup
       enable_gc_optimizations
       register_signal_handlers
       prune_dead_workers
-      call_before_fork
+      call_before_first_fork
       register_worker
     end
 
@@ -308,14 +308,14 @@ def register_worker
       started!
     end
 
-    #Call any before_fork procs, if any
-    def call_before_fork
-      return unless before_fork
-      log "Calling before_fork"
-      before_fork.call
+    #Call any before_first_fork procs, if any
+    def call_before_first_fork
+      return unless before_first_fork
+      log "Calling before_first_fork"
+      before_first_fork.call
     end
 
-    #Call any before_fork procs, if any
+    #Call any before_first_fork procs, if any
     def call_after_fork
       return unless after_fork
       log "Calling after_fork"

test/worker_test.rb

@@ -244,14 +244,14 @@
   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.before_first_fork = Proc.new { $BEFORE_FORK_CALLED = true }
     workerA = Resque::Worker.new(:jobs)
     Resque::Job.create(:jobs, SomeJob, 20, '/tmp')
 
     assert !$BEFORE_FORK_CALLED
     workerA.work(0)
     assert $BEFORE_FORK_CALLED
-    Resque.before_fork = nil
+    Resque.before_first_fork = nil
   end
 
   test "Will call a after_fork proc after the worker has successfully forked" do