diff options
author | Eric Wong <normalperson@yhbt.net> | 2010-01-05 16:10:17 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-01-05 16:10:17 -0800 |
commit | 841f967666292f634c6af485f7ac452f36cc2028 (patch) | |
tree | 4dba86c2fb545a57c7728d1275d276e12d3b26d5 /bin | |
parent | 40924ca5f42a5708159ac27b992805f24ecbae9b (diff) | |
parent | fe005f50efc8db5b9f4b2387b3b2c42f12d7c2c0 (diff) | |
download | unicorn-841f967666292f634c6af485f7ac452f36cc2028.tar.gz |
* ready_pipe: launcher: no point in sync-ing $stdin launcher: fix compatibility with other servers clarify errors when listeners fail to bind launcher: descriptive error message on startup failure Avoid leaking ready pipe file descriptor to workers exit with failure if master dies when daemonized
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) |