From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.7 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, URIBL_BLOCKED shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: unicorn-public@bogomips.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 0BDAB1F716; Thu, 7 Jan 2016 03:41:08 +0000 (UTC) Date: Thu, 7 Jan 2016 03:41:07 +0000 From: Eric Wong To: unicorn-public@bogomips.org Subject: [PUSHED] various documentation updates Message-ID: <20160107034107.GA23135@dcvr.yhbt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: * 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 --- Also pushed to the website http://unicorn.bogomips.org/ (using olddoc.git @ c98abe82b6b3 from git://80x24.org/olddoc.git) Curious, does anybody out there use Rails 2.x or earlier? .olddoc.yml | 1 + Documentation/unicorn.1.txt | 1 - Documentation/unicorn_rails.1.txt | 2 +- HACKING | 2 +- README | 17 +++++------------ lib/unicorn/configurator.rb | 5 +++-- lib/unicorn/http_server.rb | 4 ++-- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.olddoc.yml b/.olddoc.yml index 063c1c6..cda8ac3 100644 --- a/.olddoc.yml +++ b/.olddoc.yml @@ -13,3 +13,4 @@ noindex: - unicorn_rails_1 public_email: unicorn-public@bogomips.org private_email: unicorn@bogomips.org +nntp_url: nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn diff --git a/Documentation/unicorn.1.txt b/Documentation/unicorn.1.txt index efdda4b..3f20a9a 100644 --- a/Documentation/unicorn.1.txt +++ b/Documentation/unicorn.1.txt @@ -175,7 +175,6 @@ the unicorn config file. # SEE ALSO -* unicorn_rails(1) * *Rack::Builder* ri/RDoc * *Unicorn::Configurator* ri/RDoc * [Unicorn RDoc][1] diff --git a/Documentation/unicorn_rails.1.txt b/Documentation/unicorn_rails.1.txt index bff703e..2ce7501 100644 --- a/Documentation/unicorn_rails.1.txt +++ b/Documentation/unicorn_rails.1.txt @@ -4,7 +4,7 @@ # NAME -unicorn_rails - a script/server-like command to launch the Unicorn HTTP server +unicorn_rails - unicorn launcher for Rails 1.x and 2.x users # SYNOPSIS diff --git a/HACKING b/HACKING index 6c5f897..0fa22cd 100644 --- a/HACKING +++ b/HACKING @@ -57,7 +57,7 @@ Please wrap documentation at 72 characters-per-line or less (long URLs are exempt) so it is comfortably readable from terminals. When referencing mailing list posts, use -"http://bogomips.org/unicorn-public/m/$MESSAGE_ID.html" if possible +http://bogomips.org/unicorn-public/$MESSAGE_ID/ if possible since the Message-ID remains searchable even if a particular site becomes unavailable. diff --git a/README b/README index db9f0d4..11de938 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ both the the request and response in between unicorn and slow clients. {nginx}[http://nginx.org/] or {Rack}[http://rack.github.io/]. * Compatible with Ruby 1.9.3 and later. - unicorn 4.8.x will remain supported for Ruby 1.8 users. + unicorn 4.x remains supported for Ruby 1.8 users. * Process management: unicorn will reap and restart workers that die from broken apps. There is no need to manage multiple processes @@ -60,7 +60,7 @@ both the the request and response in between unicorn and slow clients. == License -unicorn is copyright 2009 by all contributors (see logs in git). +unicorn is copyright 2009-2016 by all contributors (see logs in git). It is based on Mongrel 1.1.5. Mongrel is copyright 2007 Zed A. Shaw and contributors. @@ -68,7 +68,7 @@ unicorn is licensed under (your choice) of the GPLv2 or later (GPLv3+ preferred), or Ruby (1.8)-specific terms. See the included LICENSE file for details. -unicorn is 100% Free Software. +unicorn is 100% Free Software (including all development tools used). == Install @@ -85,10 +85,9 @@ You can get the latest source via git from the following locations git://bogomips.org/unicorn.git git://repo.or.cz/unicorn.git (mirror) -You may browse the code from the web and download the latest snapshot -tarballs here: +You may browse the code from the web: -* http://bogomips.org/unicorn.git (cgit) +* http://bogomips.org/unicorn.git * http://repo.or.cz/w/unicorn.git (gitweb) See the HACKING guide on how to contribute and build prerelease gems @@ -102,12 +101,6 @@ In APP_ROOT, run: unicorn -=== Ancient Rails 1.2 - 2.x versions - -In RAILS_ROOT, run: - - unicorn_rails - unicorn will bind to all interfaces on TCP port 8080 by default. You may use the +--listen/-l+ switch to bind to a different address:port or a UNIX socket. 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 @@ def before_exec(*args, &block) # 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 @@ def before_exec(*args, &block) # 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, -- EW