Revert "Merge pull request resque#680 from mrzor/hooks"

This reverts commit f793235, reversing
changes made to 4eabd83.

Author: steveklabnik

.gitignore

@@ -1,4 +1,3 @@
 Gemfile.lock
 doc/
 test/dump.rdb
-test/dump-cluster.rdb

lib/resque.rb

@@ -85,46 +85,41 @@ def redis_id
   # changes you make will be permanent for the lifespan of the
   # worker.
   #
-  # Call with a block to register a hook.
-  # Call with no arguments to return all registered hooks.
+  # Call with a block to set the hook.
+  # Call with no arguments to return the hook.
   def before_first_fork(&block)
-    block ? register_hook(:before_first_fork, block) : hooks(:before_first_fork)
+    block ? (@before_first_fork = block) : @before_first_fork
   end
 
-  # Register a before_first_fork proc.
-  def before_first_fork=(block)
-    register_hook(:before_first_fork, block)
-  end
+  # Set a proc that will be called in the parent process before the
+  # worker forks for the first time.
+  attr_writer :before_first_fork
 
   # The `before_fork` hook will be run in the **parent** process
   # before every job, so be careful- any changes you make will be
   # permanent for the lifespan of the worker.
   #
-  # Call with a block to register a hook.
-  # Call with no arguments to return all registered hooks.
+  # Call with a block to set the hook.
+  # Call with no arguments to return the hook.
   def before_fork(&block)
-    block ? register_hook(:before_fork, block) : hooks(:before_fork)
+    block ? (@before_fork = block) : @before_fork
   end
 
-  # Register a before_fork proc.
-  def before_fork=(block)
-    register_hook(:before_fork, block)
-  end
+  # Set the before_fork proc.
+  attr_writer :before_fork
 
   # The `after_fork` hook will be run in the child process and is passed
   # the current job. Any changes you make, therefore, will only live as
   # long as the job currently being processed.
   #
-  # Call with a block to register a hook.
-  # Call with no arguments to return all registered hooks.
+  # Call with a block to set the hook.
+  # Call with no arguments to return the hook.
   def after_fork(&block)
-    block ? register_hook(:after_fork, block) : hooks(:after_fork)
+    block ? (@after_fork = block) : @after_fork
   end
 
-  # Register an after_fork proc.
-  def after_fork=(block)
-    register_hook(:after_fork, block)
-  end
+  # Set the after_fork proc.
+  attr_writer :after_fork
 
   # The `before_pause` hook will be run in the parent process before the
   # worker has paused processing (via #pause_processing or SIGUSR2).
@@ -408,29 +403,5 @@ def keys
       key.sub("#{redis.namespace}:", '')
     end
   end
-
-  private
-
-  # Register a new proc as a hook. If the block is nil this is the
-  # equivalent of removing all hooks of the given name.
-  #
-  # `name` is the hook that the block should be registered with.
-  def register_hook(name, block)
-    return clear_hooks(name) if block.nil?
-
-    @hooks ||= {}
-    @hooks[name] ||= []
-    @hooks[name] << block
-  end
-
-  # Clear all hooks given a hook name.
-  def clear_hooks(name)
-    @hooks && @hooks[name] = []
-  end
-
-  # Retrieve all hooks of a given name.
-  def hooks(name)
-    (@hooks && @hooks[name]) || []
-  end
 end
 

lib/resque/worker.rb

@@ -405,14 +405,12 @@ def register_worker
 
     # Runs a named hook, passing along any arguments.
     def run_hook(name, *args)
-      return unless hooks = Resque.send(name)
-      msg = "Running #{name} hooks"
+      return unless hook = Resque.send(name)
+      msg = "Running #{name} hook"
       msg << " with #{args.inspect}" if args.any?
       log msg
 
-      hooks.each do |hook|
-        args.any? ? hook.call(*args) : hook.call
-      end
+      args.any? ? hook.call(*args) : hook.call
     end
 
     # Unregisters ourself as a worker. Useful when shutting down.

test/resque_hook_test.rb

@@ -5,6 +5,10 @@
     Resque.redis = Resque.redis # reset state in Resque object
     Resque.redis.flushall
 
+    Resque.before_first_fork = nil
+    Resque.before_fork = nil
+    Resque.after_fork = nil
+
     @worker = Resque::Worker.new(:jobs)
     Resque::Job.create(:jobs, SomeJob, 20, '/tmp')
   end