about summary refs log tree commit homepage
path: root/lib/unicorn/launcher.rb
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-10 08:47:10 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-10 09:46:54 +0000
commit4accf4449390c649bce0b1c9d84314d65fd41f8e (patch)
tree524a01dc72bb030de496986d29cdbc8183ce4919 /lib/unicorn/launcher.rb
parentbff55e030fa3dcd4ac24ec481a67d6f327d67797 (diff)
downloadunicorn-4accf4449390c649bce0b1c9d84314d65fd41f8e.tar.gz
Since we added support for the "working_directory" parameter, it
often became unclear where/when certain paths would be bound.

There are some extremely nasty dependencies and ordering issues
when doing this.  It's all pretty fragile, but works for now
and we even have a full integration test to keep it working.

I plan on cleaning this up 2.x.x to be less offensive to look
at (Rainbows! and Zbatery are a bit tied to this at the moment).

Thanks to Pierre Baillet for reporting this.

ref: http://mid.gmane.org/AANLkTimKb7JARr_69nfVrJLvMZH3Gvs1o_KwZFLKfuxy@mail.gmail.com
Diffstat (limited to 'lib/unicorn/launcher.rb')
-rw-r--r--lib/unicorn/launcher.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/unicorn/launcher.rb b/lib/unicorn/launcher.rb
index 5ab04c7..7f3ffa6 100644
--- a/lib/unicorn/launcher.rb
+++ b/lib/unicorn/launcher.rb
@@ -56,8 +56,9 @@ class Unicorn::Launcher
       end
     end
     # $stderr/$stderr can/will be redirected separately in the Unicorn config
-    Unicorn::Configurator::DEFAULTS[:stderr_path] = "/dev/null"
-    Unicorn::Configurator::DEFAULTS[:stdout_path] = "/dev/null"
+    Unicorn::Configurator::DEFAULTS[:stderr_path] ||= "/dev/null"
+    Unicorn::Configurator::DEFAULTS[:stdout_path] ||= "/dev/null"
+    Unicorn::Configurator::RACKUP[:daemonized] = true
   end
 
 end