unicorn 5.0.1 → 5.3.1

data/NEWS

@@ -1,3 +1,376 @@
+=== unicorn 5.3.0 / 2017-04-01 08:03 UTC
+
+  A couple of portability fixes from Dylan Thacker-Smith and
+  Jeremy Evans since 5.3.0.pre1 over a week ago, but this looks
+  ready for a stable release, today.
+
+  When I started this over 8 years ago, I wondered if this would
+  just end up being an April Fools' joke.  Guess not.  I guess I
+  somehow tricked people into using a terribly marketed web server
+  that cannot talk directly to untrusted clients :x  Anyways,
+  unicorn won't be able to handle slow clients 8 years from now,
+  either, or 80 years from now.  And I vow never to learn to use
+  new-fangled things like epoll, kqueue, or threads :P
+
+  Anyways, this is a largish release with several new features,
+  and no backwards incompatibilities.
+
+  Simon Eskildsen contributed heavily using TCP_INFO under Linux
+  to implement the (now 5 year old) check_client_connection feature:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-check_client_connection
+    https://bogomips.org/unicorn-public/?q=s:check_client_connection&d:..20170401&x=t
+
+  This also led to FreeBSD and OpenBSD portability improvements in
+  one of our dependencies, raindrops:
+
+     https://bogomips.org/raindrops-public/20170323024829.GA5190@dcvr/T/#u
+
+  Jeremy Evans contributed several new features.  First he
+  implemented after_worker_exit to aid debugging:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-after_worker_exit
+    https://bogomips.org/unicorn-public/?q=s:after_worker_exit&d:..20170401&x=t#t
+
+  And then security-related features to isolate workers.  Workers
+  may now chroot to drop access to the master filesystem, and the
+  new after_worker_ready configuration hook now exists to aid with
+  chroot support in workers:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-after_worker_ready
+    https://bogomips.org/unicorn/Unicorn/Worker.html#method-i-user
+    https://bogomips.org/unicorn-public/?q=s:after_worker_ready&d:..20170401&x=t#t
+    https://bogomips.org/unicorn-public/?q=s:chroot&d:..20170401&x=t#t
+
+  Additionally, workers may run in a completely different VM space
+  (nullifying preload_app and any CoW savings) with the new
+  worker_exec option:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-worker_exec
+    https://bogomips.org/unicorn-public/?q=s:worker_exec&d:..20170401&x=t#t
+
+  There are also several improvements to FreeBSD and OpenBSD
+  support with the addition of these features.
+
+  shortlog of changes since v5.2.0 (2016-10-31):
+
+  Dylan Thacker-Smith (1):
+        Check for Socket::TCP_INFO constant before trying to get TCP_INFO
+
+  Eric Wong (30):
+        drop rb_str_set_len compatibility replacement
+        TUNING: document THP caveat for Linux users
+        tee_input: simplify condition for IO#write
+        remove response_start_sent
+        http_request: freeze constant strings passed IO#write
+        Revert "remove response_start_sent"
+        t/t0012-reload-empty-config.sh: access ivars directly if needed
+        t0011-active-unix-socket.sh: fix race condition in test
+        new test for check_client_connection
+        revert signature change to HttpServer#process_client
+        support "struct tcp_info" on non-Linux and Ruby 2.2+
+        unicorn_http: reduce rb_global_variable calls
+        oob_gc: rely on opt_aref_with optimization on Ruby 2.2+
+        http_request: reduce insn size for check_client_connection
+        freebsd: avoid EINVAL when setting accept filter
+        test-lib: expr(1) portability fix
+        tests: keep disabled tests defined
+        test_exec: SO_KEEPALIVE value only needs to be true
+        doc: fix links to raindrops project
+        http_request: support proposed Raindrops::TCP states on non-Linux
+        ISSUES: expand on mail archive info + subscription disclaimer
+        test_ccc: use a pipe to synchronize test
+        doc: remove private email support address
+        input: update documentation and hide internals.
+        http_server: initialize @pid ivar
+        gemspec: remove olddoc from build dependency
+        doc: add version annotations for new features
+        unicorn 5.3.0.pre1
+        doc: note after_worker_exit is also 5.3.0+
+        test_exec: SO_KEEPALIVE value only needs to be true (take #2)
+
+  Jeremy Evans (7):
+        Add after_worker_exit configuration option
+        Fix code example in after_worker_exit documentation
+        Add support for chroot to Worker#user
+        Add after_worker_ready configuration option
+        Add worker_exec configuration option
+        Don't pass a block for fork when forking workers
+        Check for SocketError on first ccc attempt
+
+  Simon Eskildsen (1):
+        check_client_connection: use tcp state on linux
+
+=== unicorn 5.3.0.pre1 / 2017-03-24 00:25 UTC
+
+  A largish release with several new features.
+
+  Simon Eskildsen contributed heavily using TCP_INFO under Linux
+  to implement the (now 5 year old) check_client_connection feature:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-check_client_connection
+    https://bogomips.org/unicorn-public/?q=s:check_client_connection&d:..20170324&x=t
+
+  This also led to FreeBSD and OpenBSD portability improvements in
+  one of our dependencies, raindrops:
+
+     https://bogomips.org/raindrops-public/20170323024829.GA5190@dcvr/T/#u
+
+  Jeremy Evans contributed several new features.  First he
+  implemented after_worker_exit to aid debugging:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-after_worker_exit
+    https://bogomips.org/unicorn-public/?q=s:after_worker_exit&d:..20170324&x=t#t
+
+  And then security-related features to isolate workers.  Workers
+  may now chroot to drop access to the master filesystem, and the
+  new after_worker_ready configuration hook now exists to aid with
+  chroot support in workers:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-after_worker_ready
+    https://bogomips.org/unicorn/Unicorn/Worker.html#method-i-user
+    https://bogomips.org/unicorn-public/?q=s:after_worker_ready&d:..20170324&x=t#t
+    https://bogomips.org/unicorn-public/?q=s:chroot&d:..20170324&x=t#t
+
+  Additionally, workers may run in a completely different VM space
+  (nullifying preload_app and any CoW savings) with the new
+  worker_exec option:
+
+    https://bogomips.org/unicorn/Unicorn/Configurator.html#method-i-worker_exec
+    https://bogomips.org/unicorn-public/?q=s:worker_exec&d:..20170324&x=t#t
+
+  There are also several improvements to FreeBSD and OpenBSD
+  support with the addition of these features.
+
+  34 changes since 5.2.0 (2016-10-31):
+
+  Eric Wong (27):
+        drop rb_str_set_len compatibility replacement
+        TUNING: document THP caveat for Linux users
+        tee_input: simplify condition for IO#write
+        remove response_start_sent
+        http_request: freeze constant strings passed IO#write
+        Revert "remove response_start_sent"
+        t/t0012-reload-empty-config.sh: access ivars directly if needed
+        t0011-active-unix-socket.sh: fix race condition in test
+        new test for check_client_connection
+        revert signature change to HttpServer#process_client
+        support "struct tcp_info" on non-Linux and Ruby 2.2+
+        unicorn_http: reduce rb_global_variable calls
+        oob_gc: rely on opt_aref_with optimization on Ruby 2.2+
+        http_request: reduce insn size for check_client_connection
+        freebsd: avoid EINVAL when setting accept filter
+        test-lib: expr(1) portability fix
+        tests: keep disabled tests defined
+        test_exec: SO_KEEPALIVE value only needs to be true
+        doc: fix links to raindrops project
+        http_request: support proposed Raindrops::TCP states on non-Linux
+        ISSUES: expand on mail archive info + subscription disclaimer
+        test_ccc: use a pipe to synchronize test
+        doc: remove private email support address
+        input: update documentation and hide internals.
+        http_server: initialize @pid ivar
+        gemspec: remove olddoc from build dependency
+        doc: add version annotations for new features
+
+  Jeremy Evans (6):
+        Add after_worker_exit configuration option
+        Fix code example in after_worker_exit documentation
+        Add support for chroot to Worker#user
+        Add after_worker_ready configuration option
+        Add worker_exec configuration option
+        Don't pass a block for fork when forking workers
+
+  Simon Eskildsen (1):
+        check_client_connection: use tcp state on linux
+
+=== unicorn 5.2.0 / 2016-10-31 20:00 UTC
+
+  Most notably, this release allows us to support requests with
+  lines delimited by LF-only, as opposed to the standard CRLF
+  pair and allowed by RFC 2616 sec 19.3.
+
+  Thanks to Mishael A Sibiryakov for the explanation and change:
+
+    https://bogomips.org/unicorn-public/1476954332.1736.156.camel@junki.org/
+
+  Thanks to Let's Encrypt, the website also moves to HTTPS
+  <https://bogomips.org/unicorn/> to improve reader privacy.  The
+  "unicorn.bogomips.org" subdomain will be retired soon to reduce
+  subjectAltName bloat and speed up certificate renewals.
+
+  There's also the usual round of documentation and example
+  updates, too.
+
+  Eric Wong (7):
+        examples/init.sh: update to reduce upgrade raciness
+        doc: systemd should only kill master in example
+        examples/logrotate.conf: update example for systemd
+        doc: update gmane URLs to point to our own archives
+        relocate website to https://bogomips.org/unicorn/
+        TODO: remove Rack 2.x item
+        build: "install-gem" target avoids network
+
+  Mishael A Sibiryakov (1):
+        Add some tolerance (RFC2616 sec. 19.3)
+
+=== unicorn 5.1.0 - rack is optional, again / 2016-04-01 00:35 UTC
+
+  Note: no code changes since 5.1.0.pre1 from January.^WNo, wait,
+  last minute performance improvement added today.  See below.
+
+  The big change is rack is not required (but still recommended).
+  Applications are expected to depend on rack on their own so they can
+  specify the version of rack they prefer without unicorn pulling
+  in a newer, potentially incompatible version.
+
+  unicorn will always attempt to work with multiple versions of rack
+  as practical.
+
+  The HTTP parser also switched to using the TypedData C-API for
+  extra type safety and memory usage accounting support in the
+  'objspace' extension.
+
+  Thanks to Adam Duke to bringing the rack change to our attention
+  and Aaron Patterson for helping with the matter.
+
+  Last minute change: we now support the new leftpad() syscall under
+  Linux for major performance and security improvement:
+
+      http://mid.gmane.org/1459463613-32473-1-git-send-email-richard@nod.at
+
+  8^H9 changes since 5.0.1:
+
+        http: TypedData C-API conversion
+        various documentation updates
+        doc: bump olddoc to ~> 1.2 for extra NNTP URL
+        rack is optional at runtime, required for dev
+        doc update for ClientShutdown exceptions class
+        unicorn 5.1.0.pre1 - rack is optional, again
+        doc: reference --keep-file-descriptors for "bundle exec"
+        doc: further trimming to reduce noise
+        use leftpad Linux syscall for speed!
+
+=== unicorn 5.1.0.pre1 - rack is optional, again / 2016-01-27 23:08 UTC
+
+  The big change is rack is not required (but still recommended).
+  Applications are expected to depend on rack on their own so they can
+  specify the version of rack they prefer without unicorn pulling
+  in a newer, potentially incompatible version.
+
+  unicorn will always attempt to work with multiple versions of rack
+  as practical.
+
+  The HTTP parser also switched to using the TypedData C-API for
+  extra type safety and memory usage accounting support in the
+  'objspace' extension.
+
+  Thanks to Adam Duke to bringing the rack change to our attention
+  and Aaron Patterson for helping with the matter.
+
+  There might be more documentation-related changes before 5.1.0
+  final.  I am considering dropping pandoc from manpage generation
+  and relying on pod2man (from Perl) because it has a wider install
+  base.
+
+  5 changes since v5.0.1:
+
+        http: TypedData C-API conversion
+        various documentation updates
+        doc: bump olddoc to ~> 1.2 for extra NNTP URL
+        rack is optional at runtime, required for dev
+        doc update for ClientShutdown exceptions class
+
+=== unicorn 5.0.1 - continuing to violate Rack SPEC / 2015-11-17 22:44 UTC
+
+  Once again, we allow nil values in response headers.  We've had
+  this bug since March 2009, and thus cannot expect existing
+  applications and middlewares running unicorn to fix this.
+
+  Unfortunately, supporting this bug contributes to application
+  server lock-in, but at least we'll document it as such.
+
+  Thanks to Owen Ou <o@heroku.com> for reporting this regression:
+
+    http://bogomips.org/unicorn-public/CAO47=rJa=zRcLn_Xm4v2cHPr6c0UswaFC_omYFEH+baSxHOWKQ@mail.gmail.com/
+
+  Additionally, systemd examples are now in the examples/ directory
+  based on a post by Christos Trochalakis <yatiohi@ideopolis.gr>:
+
+    http://bogomips.org/unicorn-public/20150708130821.GA1361@luke.ws.skroutz.gr/
+
+=== unicorn 5.0.0 - most boring major release. EVER. / 2015-11-01 08:48 UTC
+
+  An evolutionary dead-end since its announcement[1] nearly six years
+  ago, this old-fashioned preforker has had enough bugs and missteps
+  that it's managed to hit version 5!
+
+  I wish I could say unicorn 5 is leaps and bounds better than 4, but
+  it is not.  This major version change allows us to drop some cruft
+  and unused features which accumulated over the years, resulting in
+  several kilobytes of memory saved[2]!
+
+  Compatibility:
+
+  * The horrible, proprietary (:P) "Status:" response header is
+    finally gone, saving at least 16 precious bytes in every HTTP
+    response.  This should make it easier to write custom HTTP clients
+    which are compatible across all HTTP servers.  It will hopefully
+    make migrating between different Rack servers easier for new
+    projects.
+
+  * Ruby 1.8 support removed.  Ruby 1.9.3 is currently the earliest
+    supported version.  However, expect minor, likely-unnoticeable
+    performance regressions if you use Ruby 2.1 or earlier.  Going
+    forward, unicorn will favor the latest version (currently 2.2) of
+    the mainline Ruby implementation, potentially sacrificing
+    performance on older Rubies.
+
+  * Some internal, undocumented features and APIs used by
+    derivative servers are gone; removing bloat and slightly lowering
+    memory use.  We have never and will never endorse the use of any
+    applications or middleware with a dependency on unicorn,
+    applications should be written for Rack instead.
+    Note: Rainbows! 5.0 will be released next week or so to be
+    compatible with unicorn 5.x
+
+  New features:
+
+  * sd_listen_fds(3) emulation added for systemd compatibility.
+    You may now stop using PID files and other process monitoring
+    software when using systemd.
+
+  * Newly-set TCP socket options are now applied to inherited sockets.
+
+  * Dynamic changes in the application to Rack::Utils::HTTP_STATUS
+    hash is now supported; allowing users to set custom status lines
+    in Rack to be reflected in unicorn.  This feature causes a minor
+    performance regression, but is made up for Ruby 2.2 users with
+    other optimizations.
+
+  * The monotonic clock is used under Ruby 2.1+, making the
+    timeout feature immune to system clock changes.
+
+  As unicorn may be used anonymously without registration, the
+  project is committed to supporting anonymous and pseudonymous
+  help requests, contributions and feedback via plain-text mail to:
+
+      unicorn-public@bogomips.org
+
+  The mail submission port (587) is open to those behind firewalls
+  and allows access via Tor and anonymous remailers.
+  Archives are accessible via: http://bogomips.org/unicorn-public/
+  and mirrored to various other places, so you do not need to use
+  a valid address when posting.
+
+  Finally, rest assured the core design of unicorn will never change.
+  It will never use new-fangled things like threads, kqueue or epoll;
+  but will always remain a preforking server serving one client
+  per-process.
+
+  [1] http://mid.gmane.org/20090211230457.GB22926@dcvr.yhbt.net
+  [2] this would've been like, totally gnarly in the 80s!
+
 === unicorn 5.0.0.pre2 - another prerelease! / 2015-07-06 21:37 UTC
 
   There is a minor TCP socket options are now applied to inherited

data/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
@@ -27,9 +27,6 @@ both the the request and response in between unicorn and slow clients.
   all run within their own isolated address space and only serve one
   client at a time for maximum robustness.
 
-* Supports all Rack applications, along with pre-Rack versions of
-  Ruby on Rails via a Rack wrapper.
-
 * Builtin reopening of all log files in your application via
   USR1 signal.  This allows logrotate to rotate files atomically and
   quickly via rename instead of the racy and slow copytruncate method.
@@ -54,13 +51,11 @@ both the the request and response in between unicorn and slow clients.
 
 * Simple and easy Ruby DSL for configuration.
 
-* Decodes chunked transfers on-the-fly, thus allowing upload progress
-  notification to be implemented as well as being able to tunnel
-  arbitrary stream-based protocols over HTTP.
+* Decodes chunked requests on-the-fly.
 
 == 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 +63,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 +80,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)
+* https://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 +96,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.
@@ -140,7 +128,7 @@ All feedback (bug reports, user/development dicussion, patches, pull
 requests) go to the mailing list/newsgroup.  See the ISSUES document for
 information on the {mailing list}[mailto:unicorn-public@bogomips.org].
 
-The mailing list is archived at http://bogomips.org/unicorn-public/
+The mailing list is archived at https://bogomips.org/unicorn-public/
 Read-only NNTP access is available at:
 nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
 nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general

data/SIGNALS

@@ -8,7 +8,7 @@ should be possible to easily share process management scripts between
 Unicorn and nginx.
 
 One example init script is distributed with unicorn:
-http://unicorn.bogomips.org/examples/init.sh
+https://bogomips.org/unicorn/examples/init.sh
 
 === Master Process
 

data/Sandbox

@@ -34,7 +34,7 @@ is the primary issue with sandboxing tools such as Bundler and Isolate.
 If you're bundling unicorn, use "bundle exec unicorn" (or "bundle exec
 unicorn_rails") to start unicorn with the correct environment variables
 
-ref: http://mid.gmane.org/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us
+ref: https://bogomips.org/unicorn-public/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us/
 
 Otherwise (if you choose to not sandbox your unicorn installation), we
 expect the tips for Isolate (below) apply, too.
@@ -43,7 +43,8 @@ expect the tips for Isolate (below) apply, too.
 
 This is no longer be an issue as of bundler 0.9.17
 
-ref: http://mid.gmane.org/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com
+ref:
+https://bogomips.org/unicorn-public/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com/
 
 === BUNDLE_GEMFILE for Capistrano users
 
@@ -63,9 +64,9 @@ before_exec hook as illustrated by https://gist.github.com/534668
 === Ruby 2.0.0 close-on-exec and SIGUSR2 incompatibility
 
 Ruby 2.0.0 enforces FD_CLOEXEC on file descriptors by default.  unicorn
-has been prepared for this behavior since unicorn 4.1.0, but we forgot
-to remind the Bundler developers.  This issue is being tracked here:
-https://github.com/bundler/bundler/issues/2628
+has been prepared for this behavior since unicorn 4.1.0, and bundler
+needs the "--keep-file-descriptors" option for "bundle exec":
+http://bundler.io/man/bundle-exec.1.html
 
 == Isolate
 

data/TODO

@@ -1,5 +1,3 @@
 * Documentation improvements
 
 * improve test suite
-
-* Rack 2.x support (when Rack 2.x exists)

data/TUNING

@@ -72,10 +72,28 @@ See Unicorn::Configurator for details on the config file format.
   have them unbuffered (File#sync = true) or they are
   record(line)-buffered in userspace before any writes.
 
-== Kernel Parameters (Linux sysctl)
+== Kernel Parameters (Linux sysctl and sysfs)
 
 WARNING: Do not change system parameters unless you know what you're doing!
 
+* Transparent hugepages (THP) improves performance in many cases,
+  but can also increase memory use when relying on a
+  copy-on-write(CoW)-friendly GC (Ruby 2.0+) with "preload_app true".
+  CoW operates at the page level, so writing to a huge page would
+  trigger a 2 MB copy (x86-64), as opposed to a 4 KB copy on a
+  regular (non-huge) page.
+
+  Consider only allowing THP to be used when it is requested via the
+  madvise(2) syscall:
+
+	echo madvise >/sys/kernel/mm/transparent_hugepage/enabled
+
+  Or disabling it system-wide, via "never".
+
+  n.b. "page" in this context only applies to the OS kernel,
+  Ruby GC implementations also use this term for the same concept
+  in a way that is agnostic to the OS.
+
 * net.core.rmem_max and net.core.wmem_max can increase the allowed
   size of :rcvbuf and :sndbuf respectively. This is mostly only useful
   for UNIX domain sockets which do not have auto-tuning buffer sizes.

data/examples/big_app_gc.rb

@@ -1,2 +1,2 @@
-# see {Unicorn::OobGC}[http://unicorn.bogomips.org/Unicorn/OobGC.html]
+# see {Unicorn::OobGC}[https://bogomips.org/unicorn/Unicorn/OobGC.html]
 # Unicorn::OobGC was broken in Unicorn v3.3.1 - v3.6.1 and fixed in v3.6.2

data/examples/init.sh

@@ -1,7 +1,16 @@
 #!/bin/sh
 set -e
+### BEGIN INIT INFO
+# Provides:          unicorn
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop unicorn Rack app server
+### END INIT INFO
+
 # Example init script, this can be used with nginx, too,
-# since nginx and unicorn accept the same signals
+# since nginx and unicorn accept the same signals.
 
 # Feel free to change any of the following variables for your app:
 TIMEOUT=${TIMEOUT-60}
@@ -9,21 +18,22 @@ APP_ROOT=/home/x/my_app/current
 PID=$APP_ROOT/tmp/pids/unicorn.pid
 CMD="/usr/bin/unicorn -D -c $APP_ROOT/config/unicorn.rb"
 INIT_CONF=$APP_ROOT/config/init.conf
+UPGRADE_DELAY=${UPGRADE_DELAY-2}
 action="$1"
 set -u
 
 test -f "$INIT_CONF" && . $INIT_CONF
 
-old_pid="$PID.oldbin"
+OLD="$PID.oldbin"
 
 cd $APP_ROOT || exit 1
 
 sig () {
-	test -s "$PID" && kill -$1 `cat $PID`
+	test -s "$PID" && kill -$1 $(cat $PID)
 }
 
 oldsig () {
-	test -s $old_pid && kill -$1 `cat $old_pid`
+	test -s "$OLD" && kill -$1 $(cat $OLD)
 }
 
 case $action in
@@ -45,18 +55,36 @@ restart|reload)
 	$CMD
 	;;
 upgrade)
-	if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+	if oldsig 0
+	then
+		echo >&2 "Old upgraded process still running with $OLD"
+		exit 1
+	fi
+
+	cur_pid=
+	if test -s "$PID"
+	then
+		cur_pid=$(cat $PID)
+	fi
+
+	if test -n "$cur_pid" &&
+			kill -USR2 "$cur_pid" &&
+			sleep $UPGRADE_DELAY &&
+			new_pid=$(cat $PID) &&
+			test x"$new_pid" != x"$cur_pid" &&
+			kill -0 "$new_pid" &&
+			kill -QUIT "$cur_pid"
 	then
 		n=$TIMEOUT
-		while test -s $old_pid && test $n -ge 0
+		while kill -0 "$cur_pid" 2>/dev/null && test $n -ge 0
 		do
 			printf '.' && sleep 1 && n=$(( $n - 1 ))
 		done
 		echo
 
-		if test $n -lt 0 && test -s $old_pid
+		if test $n -lt 0 && kill -0 "$cur_pid" 2>/dev/null
 		then
-			echo >&2 "$old_pid still exists after $TIMEOUT seconds"
+			echo >&2 "$cur_pid still running after $TIMEOUT seconds"
 			exit 1
 		fi
 		exit 0

data/examples/logrotate.conf

@@ -3,6 +3,9 @@
 #
 # See the logrotate(8) manpage for more information:
 #    http://linux.die.net/man/8/logrotate
+#
+# public logrotate-related discussion in our archives:
+#    https://bogomips.org/unicorn-public/?q=logrotate
 
 # Modify the following glob to match the logfiles your app writes to:
 /var/log/unicorn_app/*.log {
@@ -22,7 +25,19 @@
 	# config.  Unicorn supports the USR1 signal and we send it
 	# as our "lastaction" action:
 	lastaction
-		# assuming your pid file is in /var/run/unicorn_app/pid
+		# For systemd users, assuming you use two services
+		# (as recommended) to allow zero-downtime upgrades.
+		# Only one service needs to be started, but signaling
+		# both here is harmless as long as they're both enabled
+		systemctl kill -s SIGUSR1 unicorn@1.service
+		systemctl kill -s SIGUSR1 unicorn@2.service
+
+		# Examples for other process management systems appreciated
+		# Mail us at unicorn-public@bogomips.org
+		# (see above for archives)
+
+		# If you use a pid file and assuming your pid file
+		# is in /var/run/unicorn_app/pid
 		pid=/var/run/unicorn_app/pid
 		test -s $pid && kill -USR1 "$(cat $pid)"
 	endscript

data/examples/nginx.conf

@@ -112,7 +112,7 @@ http {
     # try_files directive appeared in in nginx 0.7.27 and has stabilized
     # over time.  Older versions of nginx (e.g. 0.6.x) requires
     # "if (!-f $request_filename)" which was less efficient:
-    # http://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
+    # https://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
     try_files $uri/index.html $uri.html $uri @app;
 
     location @app {

data/examples/unicorn.conf.minimal.rb

@@ -1,9 +1,9 @@
 # Minimal sample configuration file for Unicorn (not Rack) when used
 # with daemonization (unicorn -D) started in your working directory.
 #
-# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# See https://bogomips.org/unicorn/Unicorn/Configurator.html for complete
 # documentation.
-# See also http://unicorn.bogomips.org/examples/unicorn.conf.rb for
+# See also https://bogomips.org/unicorn/examples/unicorn.conf.rb for
 # a more verbose configuration using more features.
 
 listen 2007 # by default Unicorn listens on port 8080