diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-12-26 17:04:57 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-12-26 17:15:11 -0800 |
commit | 5eea32764571b721cd1a89cf9ebfa853c621ac9e (patch) | |
tree | 7aae0814fe23d06945b92ee9158b3f02bbd37b4b /bin | |
parent | 643994afcdbd4121c0d131a87052cdd17d40e54f (diff) | |
download | unicorn-5eea32764571b721cd1a89cf9ebfa853c621ac9e.tar.gz |
This behavior change also means our grandparent (launched from a controlling terminal or script) will wait until the master process is ready before returning. Thanks to IƱaki Baz Castillo for the initial implementations and inspiration.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/unicorn | 2 | ||||
-rwxr-xr-x | bin/unicorn_rails | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/unicorn b/bin/unicorn index 651c2ff..5af021d 100755 --- a/bin/unicorn +++ b/bin/unicorn @@ -161,5 +161,5 @@ if $DEBUG }) end -Unicorn::Launcher.daemonize! if daemonize +Unicorn::Launcher.daemonize!(options) if daemonize Unicorn.run(app, options) diff --git a/bin/unicorn_rails b/bin/unicorn_rails index 4a22a8c..b1458fc 100755 --- a/bin/unicorn_rails +++ b/bin/unicorn_rails @@ -202,6 +202,6 @@ end if daemonize options[:pid] = rails_pid - Unicorn::Launcher.daemonize! + Unicorn::Launcher.daemonize!(options) end Unicorn.run(app, options) |