examples/pitchfork.conf.rb in pitchfork-0.2.0 vs examples/pitchfork.conf.rb in pitchfork-0.3.0

@@ -21,57 +21,19 @@
 check_client_connection false
 
 # local variable to guard against running a hook multiple times
 run_once = true
 
-after_promotion do |server, worker|
-  # the following is highly recommended for Rails
-  # as there's no need for the mold process to hold a connection
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-
+after_mold_fork do |server, mold|
   # Occasionally, it may be necessary to run non-idempotent code in the
   # master before forking.  Keep in mind the above disconnect! example
   # is idempotent and does not need a guard.
   if run_once
     # do_something_once_here ...
     run_once = false # prevent from firing again
   end
 
-  # The following is only recommended for memory/DB-constrained
-  # installations.  It is not needed if your system can house
-  # twice as many worker_processes as you have configured.
-  #
-  # # This allows a new master process to incrementally
-  # # phase out the old master process with SIGTTOU to avoid a
-  # # thundering herd
-  # # when doing a transparent upgrade.  The last worker spawned
-  # # will then kill off the old master process with a SIGQUIT.
-  # old_pid = "#{server.config[:pid]}.oldbin"
-  # if old_pid != server.pid
-  #   begin
-  #     sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-  #     Process.kill(sig, File.read(old_pid).to_i)
-  #   rescue Errno::ENOENT, Errno::ESRCH
-  #   end
-  # end
-  #
-  # Throttle the master from forking too quickly by sleeping.  Due
-  # to the implementation of standard Unix signal handlers, this
-  # helps (but does not completely) prevent identical, repeated signals
-  # from being lost when the receiving process is busy.
-  # sleep 1
 end
 
-after_fork do |server, worker|
-  # per-process listener ports for debugging/admin/migrations
-  # addr = "127.0.0.1:#{9293 + worker.nr}"
-  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-
-  # the following is *required* for Rails
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-
-  # You may also want to check and
-  # restart any other shared sockets/descriptors such as Memcached,
-  # and Redis.
+after_worker_fork do |server, worker|
+  # You may want to check and restart any shared sockets/descriptors
 end