diff options
author | Eric Wong <normalperson@yhbt.net> | 2010-07-13 08:53:48 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-07-13 08:53:48 +0000 |
commit | 3f0f9d6d72cf17b34c130b86eb933bbc513b24b3 (patch) | |
tree | 1cdb0884df5cb439ef1050221b18022cfd4aa439 | |
parent | ac15513bb81a345cd12c67702a81a585b8b0514e (diff) | |
download | unicorn-3f0f9d6d72cf17b34c130b86eb933bbc513b24b3.tar.gz |
This was accidentally enabled when ready_pipe was developed. While re-daemonizing appears harmless in most cases this makes detecting backed-out upgrades from the original master process impossible.
-rw-r--r-- | lib/unicorn/launcher.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/unicorn/launcher.rb b/lib/unicorn/launcher.rb index 0d957cf..0d415dd 100644 --- a/lib/unicorn/launcher.rb +++ b/lib/unicorn/launcher.rb @@ -24,11 +24,7 @@ module Unicorn::Launcher # We only start a new process group if we're not being reexecuted # and inheriting file descriptors from our parent - if ENV['UNICORN_FD'] - exit if fork - Process.setsid - exit if fork - else + unless ENV['UNICORN_FD'] # grandparent - reads pipe, exits when master is ready # \_ parent - exits immediately ASAP # \_ unicorn master - writes to pipe when ready |