diff options
| author | Eric Wong <e@80x24.org> | 2016-01-07 03:16:09 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2016-01-07 03:33:50 +0000 |
| commit | 9e8bb89306fd2b2627a4b2c35a0f45ae4a49e184 (patch) | |
| tree | 99fcdb12ffbec2667646cc4d2a1e8ca9fdb129ff /lib | |
| parent | 5b5cf896871efdb110ae831fd7fc34fb78ec2243 (diff) | |
| download | unicorn-9e8bb89306fd2b2627a4b2c35a0f45ae4a49e184.tar.gz | |
* add nntp_url to the olddoc website footer * update legacy support status for 4.x (not 4.8.x) * update copyright range to 2016 * note all of our development tools are Free Software, too * remove cgit mention; it may not always be cgit (but URLs should remain compatible). * discourage downloading snapshot tarballs; "git clone" + periodic "git fetch" is more efficient * remove most mentions of unicorn_rails as that was meant for ancient Rails 1.x/2.x users * update path reference to Ruby 2.3.0 * fix nginx upstream module link to avoid redirect * shorten Message-ID example to avoid redirects and inadvertant linkage
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unicorn/configurator.rb | 5 | ||||
| -rw-r--r-- | lib/unicorn/http_server.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 4da19bb..948c6e3 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -181,8 +181,6 @@ class Unicorn::Configurator # to have nginx always retry backends that may have had workers # SIGKILL-ed due to timeouts. # - # # See http://wiki.nginx.org/NginxHttpUpstreamModule for more details - # # on nginx upstream configuration: # upstream unicorn_backend { # # for UNIX domain socket setups: # server unix:/path/to/.unicorn.sock fail_timeout=0; @@ -192,6 +190,9 @@ class Unicorn::Configurator # server 192.168.0.8:8080 fail_timeout=0; # server 192.168.0.9:8080 fail_timeout=0; # } + # + # See http://nginx.org/en/docs/http/ngx_http_upstream_module.html + # for more details on nginx upstream configuration. def timeout(seconds) set_int(:timeout, seconds, 3) # POSIX says 31 days is the smallest allowed maximum timeout for select() diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index ca56ed3..741cca5 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -36,7 +36,7 @@ class Unicorn::HttpServer # or even different installations of the same applications without # downtime. Keys of this constant Hash are described as follows: # - # * 0 - the path to the unicorn/unicorn_rails executable + # * 0 - the path to the unicorn executable # * :argv - a deep copy of the ARGV array the executable originally saw # * :cwd - the working directory of the application, this is where # you originally started Unicorn. @@ -45,7 +45,7 @@ class Unicorn::HttpServer # you can set the following in your Unicorn config file, HUP and then # continue with the traditional USR2 + QUIT upgrade steps: # - # Unicorn::HttpServer::START_CTX[0] = "/home/bofh/2.2.0/bin/unicorn" + # Unicorn::HttpServer::START_CTX[0] = "/home/bofh/2.3.0/bin/unicorn" START_CTX = { :argv => ARGV.map(&:dup), 0 => $0.dup, |