diff options
author | Eric Wong <e@80x24.org> | 2017-03-08 07:33:38 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2017-03-08 07:42:24 +0000 |
commit | df9d1de2cfb3ccf27d0baeee4ced2515bd2dfc89 (patch) | |
tree | d312a9f8adf59720d36cb326d94a910ab23147e0 | |
parent | ff13ad38ba9f83e0dd298be451aac7c75145d33b (diff) | |
download | unicorn-df9d1de2cfb3ccf27d0baeee4ced2515bd2dfc89.tar.gz |
We will inevitably have people running old unicorn versions for many years to come; but they may be reading the latest documentation online. Annotate when the new features (will) appear to avoid misleading users on old versions.
-rw-r--r-- | lib/unicorn/configurator.rb | 2 | ||||
-rw-r--r-- | lib/unicorn/worker.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 7ed5ffa..3eb8c22 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -186,6 +186,8 @@ class Unicorn::Configurator # # Do not use Configurator#user if you rely on changing users in the # after_worker_ready hook. + # + # after_worker_ready is only available in unicorn 5.3.0+ def after_worker_ready(*args, &block) set_hook(:after_worker_ready, block_given? ? block : args[0]) end diff --git a/lib/unicorn/worker.rb b/lib/unicorn/worker.rb index e22c1bf..2f5b6a6 100644 --- a/lib/unicorn/worker.rb +++ b/lib/unicorn/worker.rb @@ -124,7 +124,10 @@ class Unicorn::Worker # Any and all errors raised within this method will be propagated # directly back to the caller (usually the +after_fork+ hook. # These errors commonly include ArgumentError for specifying an - # invalid user/group and Errno::EPERM for insufficient privileges + # invalid user/group and Errno::EPERM for insufficient privileges. + # + # chroot support is only available in unicorn 5.3.0+ + # user and group switching appeared in unicorn 0.94.0 (2009-11-05) def user(user, group = nil, chroot = false) # we do not protect the caller, checking Process.euid == 0 is # insufficient because modern systems have fine-grained |