unicorn 5.3.1 → 6.1.0

data/lib/unicorn/tmpio.rb

@@ -11,12 +11,18 @@ class Unicorn::TmpIO < File
   # immediately, switched to binary mode, and userspace output
   # buffering is disabled
   def self.new
+    path = nil
+
+    # workaround File#path being tainted:
+    # https://bugs.ruby-lang.org/issues/14485
     fp = begin
-      super("#{Dir::tmpdir}/#{rand}", RDWR|CREAT|EXCL, 0600)
+      path = "#{Dir::tmpdir}/#{rand}"
+      super(path, RDWR|CREAT|EXCL, 0600)
     rescue Errno::EEXIST
       retry
     end
-    unlink(fp.path)
+
+    unlink(path)
     fp.binmode
     fp.sync = true
     fp

data/lib/unicorn/util.rb

@@ -11,8 +11,8 @@ module Unicorn::Util # :nodoc:
       fp.stat.file? &&
       fp.sync &&
       (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
-    rescue IOError, Errno::EBADF
-      false
+  rescue IOError, Errno::EBADF
+    false
   end
 
   def self.chown_logs(uid, gid)
@@ -64,7 +64,7 @@ module Unicorn::Util # :nodoc:
           fp.reopen(fp.path, "a")
         else
           # We should not need this workaround, Ruby can be fixed:
-          #    http://bugs.ruby-lang.org/issues/9036
+          #    https://bugs.ruby-lang.org/issues/9036
           # MRI will not call call fclose(3) or freopen(3) here
           # since there's no associated std{in,out,err} FILE * pointer
           # This should atomically use dup3(2) (or dup2(2)) syscall

data/lib/unicorn/version.rb

@@ -1 +1 @@
-Unicorn::Const::UNICORN_VERSION = '5.3.1'
+Unicorn::Const::UNICORN_VERSION = '6.1.0'

data/lib/unicorn/worker.rb

@@ -122,6 +122,11 @@ class Unicorn::Worker
   # the +after_fork+ hook after any privileged functions need to be
   # run (e.g. to set per-worker CPU affinity, niceness, etc)
   #
+  # +group+ can be specified as a string, or as an array of two
+  # strings.  If an array of two strings is given, the first string
+  # is used as the primary group of the process, and the second is
+  # used as the group of the log files.
+  #
   # 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
@@ -134,8 +139,17 @@ class Unicorn::Worker
     # insufficient because modern systems have fine-grained
     # capabilities.  Let the caller handle any and all errors.
     uid = Etc.getpwnam(user).uid
-    gid = Etc.getgrnam(group).gid if group
-    Unicorn::Util.chown_logs(uid, gid)
+
+    if group
+      if group.is_a?(Array)
+        group, log_group = group
+        log_gid = Etc.getgrnam(log_group).gid
+      end
+      gid = Etc.getgrnam(group).gid
+      log_gid ||= gid
+    end
+
+    Unicorn::Util.chown_logs(uid, log_gid)
     if gid && Process.egid != gid
       Process.initgroups(user, gid)
       Process::GID.change_privilege(gid)

data/lib/unicorn.rb

@@ -2,6 +2,8 @@
 require 'etc'
 require 'stringio'
 require 'kgio'
+require 'raindrops'
+require 'io/wait'
 
 begin
   require 'rack'
@@ -43,12 +45,8 @@ module Unicorn
       abort "rack and Rack::Builder must be available for processing #{ru}"
     end
 
-    # Op is going to get cleared before the returned lambda is called, so
-    # save this value so that it's still there when we need it:
-    no_default_middleware = op[:no_default_middleware]
-
     # always called after config file parsing, may be called after forking
-    lambda do ||
+    lambda do |_, server|
       inner_app = case ru
       when /\.ru$/
         raw = File.read(ru)
@@ -59,9 +57,12 @@ module Unicorn
         Object.const_get(File.basename(ru, '.rb').capitalize)
       end
 
-      pp({ :inner_app => inner_app }) if $DEBUG
+      if $DEBUG
+        require 'pp'
+        pp({ :inner_app => inner_app })
+      end
 
-      return inner_app if no_default_middleware
+      return inner_app unless server.default_middleware
 
       middleware = { # order matters
         ContentLength: nil,
@@ -95,7 +96,7 @@ module Unicorn
 
   # returns an array of strings representing TCP listen socket addresses
   # and Unix domain socket paths.  This is useful for use with
-  # Raindrops::Middleware under Linux: https://bogomips.org/raindrops/
+  # Raindrops::Middleware under Linux: https://yhbt.net/raindrops/
   def self.listener_names
     Unicorn::HttpServer::LISTENERS.map do |io|
       Unicorn::SocketHelper.sock_name(io)
@@ -109,9 +110,23 @@ module Unicorn
     exc.backtrace.each { |line| logger.error(line) }
   end
 
-  # remove this when we only support Ruby >= 2.0
+  F_SETPIPE_SZ = 1031 if RUBY_PLATFORM =~ /linux/
+
   def self.pipe # :nodoc:
-    Kgio::Pipe.new.each { |io| io.close_on_exec = true }
+    Kgio::Pipe.new.each do |io|
+      # shrink pipes to minimize impact on /proc/sys/fs/pipe-user-pages-soft
+      # limits.
+      if defined?(F_SETPIPE_SZ)
+        begin
+          io.fcntl(F_SETPIPE_SZ, Raindrops::PAGE_SIZE)
+        rescue Errno::EINVAL
+          # old kernel
+        rescue Errno::EPERM
+          # resizes fail if Linux is close to the pipe limit for the user
+          # or if the user does not have permissions to resize
+        end
+      end
+    end
   end
   # :startdoc:
 end

data/man/man1/unicorn.1

@@ -1,4 +1,5 @@
 .TH "UNICORN" "1" "September 15, 2009" "Unicorn User Manual" ""
+.hy
 .SH NAME
 .PP
 unicorn \- a rackup\-like command to launch the Unicorn HTTP server
@@ -8,74 +9,73 @@ unicorn [\-c CONFIG_FILE] [\-E RACK_ENV] [\-D] [RACKUP_FILE]
 .SH DESCRIPTION
 .PP
 A rackup(1)\-like command to launch Rack applications using Unicorn.
-It is expected to be started in your application root (APP_ROOT), but
-the "working_directory" directive may be used in the CONFIG_FILE.
+It is expected to be started in your application root (APP_ROOT),
+but the "working_directory" directive may be used in the CONFIG_FILE.
 .PP
-While unicorn takes a myriad of command\-line options for compatibility
-with ruby(1) and rackup(1), it is recommended to stick to the few
-command\-line options specified in the SYNOPSIS and use the CONFIG_FILE
-as much as possible.
+While unicorn takes a myriad of command\-line options for
+compatibility with ruby(1) and rackup(1), it is recommended to stick
+to the few command\-line options specified in the SYNOPSIS and use
+the CONFIG_FILE as much as possible.
 .SH RACKUP FILE
 .PP
-This defaults to "config.ru" in APP_ROOT.
-It should be the same file used by rackup(1) and other Rack launchers,
-it uses the \f[I]Rack::Builder\f[] DSL.
+This defaults to "config.ru" in APP_ROOT.  It should be the same
+file used by rackup(1) and other Rack launchers, it uses the
+\f[I]Rack::Builder\f[] DSL.
 .PP
-Embedded command\-line options are mostly parsed for compatibility with
-rackup(1) but strongly discouraged.
+Embedded command\-line options are mostly parsed for compatibility
+with rackup(1) but strongly discouraged.
 .SH UNICORN OPTIONS
 .TP
 .B \-c, \-\-config\-file CONFIG_FILE
-Path to the Unicorn\-specific config file.
-The config file is implemented as a Ruby DSL, so Ruby code may executed.
-See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-full list of directives available from the DSL.
-Using an absolute path for for CONFIG_FILE is recommended as it makes
-multiple instances of Unicorn easily distinguishable when viewing ps(1)
-output.
+Path to the Unicorn\-specific config file.  The config file is
+implemented as a Ruby DSL, so Ruby code may executed.
+See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the full
+list of directives available from the DSL.
+Using an absolute path for for CONFIG_FILE is recommended as it
+makes multiple instances of Unicorn easily distinguishable when
+viewing ps(1) output.
 .RS
 .RE
 .TP
 .B \-D, \-\-daemonize
-Run daemonized in the background.
-The process is detached from the controlling terminal and stdin is
-redirected to "/dev/null".
-Unlike many common UNIX daemons, we do not chdir to "/" upon
-daemonization to allow more control over the startup/upgrade process.
-Unless specified in the CONFIG_FILE, stderr and stdout will also be
-redirected to "/dev/null".
+Run daemonized in the background.  The process is detached from
+the controlling terminal and stdin is redirected to "/dev/null".
+Unlike many common UNIX daemons, we do not chdir to "/"
+upon daemonization to allow more control over the startup/upgrade
+process.
+Unless specified in the CONFIG_FILE, stderr and stdout will
+also be redirected to "/dev/null".
 .RS
 .RE
 .TP
 .B \-E, \-\-env RACK_ENV
-Run under the given RACK_ENV.
-See the RACK ENVIRONMENT section for more details.
+Run under the given RACK_ENV.  See the RACK ENVIRONMENT section
+for more details.
 .RS
 .RE
 .TP
 .B \-l, \-\-listen ADDRESS
-Listens on a given ADDRESS.
-ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken to
-mean a TCP socket and PATH is meant to be a path to a UNIX domain
-socket.
-Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080) For
-production deployments, specifying the "listen" directive in CONFIG_FILE
-is recommended as it allows fine\-tuning of socket options.
+Listens on a given ADDRESS.  ADDRESS may be in the form of
+HOST:PORT or PATH, HOST:PORT is taken to mean a TCP socket
+and PATH is meant to be a path to a UNIX domain socket.
+Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080)
+For production deployments, specifying the "listen" directive in
+CONFIG_FILE is recommended as it allows fine\-tuning of socket
+options.
 .RS
 .RE
 .TP
 .B \-N, \-\-no\-default\-middleware
-Disables loading middleware implied by RACK_ENV.
-This bypasses the configuration documented in the RACK ENVIRONMENT
-section, but still allows RACK_ENV to be used for
-application/framework\-specific purposes.
+Disables loading middleware implied by RACK_ENV.  This bypasses the
+configuration documented in the RACK ENVIRONMENT section, but still
+allows RACK_ENV to be used for application/framework\-specific purposes.
 .RS
 .RE
 .SH RACKUP COMPATIBILITY OPTIONS
 .TP
 .B \-o, \-\-host HOST
-Listen on a TCP socket belonging to HOST, default is "0.0.0.0" (all
-addresses).
+Listen on a TCP socket belonging to HOST, default is
+"0.0.0.0" (all addresses).
 If specified multiple times on the command\-line, only the
 last\-specified value takes effect.
 This option only exists for compatibility with the rackup(1) command,
@@ -85,8 +85,8 @@ use of "\-l"/"\-\-listen" switch is recommended instead.
 .TP
 .B \-p, \-\-port PORT
 Listen on the specified TCP PORT, default is 8080.
-If specified multiple times on the command\-line, only the
-last\-specified value takes effect.
+If specified multiple times on the command\-line, only the last\-specified
+value takes effect.
 This option only exists for compatibility with the rackup(1) command,
 use of "\-l"/"\-\-listen" switch is recommended instead.
 .RS
@@ -99,9 +99,8 @@ No\-op, this exists only for compatibility with rackup(1).
 .SH RUBY OPTIONS
 .TP
 .B \-e, \-\-eval LINE
-Evaluate a LINE of Ruby code.
-This evaluation happens immediately as the command\-line is being
-parsed.
+Evaluate a LINE of Ruby code.  This evaluation happens
+immediately as the command\-line is being parsed.
 .RS
 .RE
 .TP
@@ -116,18 +115,17 @@ Turn on verbose warnings, the $VERBOSE variable is set to true.
 .RE
 .TP
 .B \-I, \-\-include PATH
-specify
-\f[I]L\f[]\f[I]O\f[]\f[I]A\f[]\f[I]D\f[]~\f[I]P\f[]~\f[I]A\f[]\f[I]T\f[]\f[I]H\f[].\f[I]P\f[]\f[I]A\f[]\f[I]T\f[]\f[I]H\f[]\f[I]w\f[]\f[I]i\f[]\f[I]l\f[]\f[I]l\f[]\f[I]b\f[]\f[I]e\f[]\f[I]p\f[]\f[I]r\f[]\f[I]e\f[]\f[I]p\f[]\f[I]e\f[]\f[I]n\f[]\f[I]d\f[]\f[I]e\f[]\f[I]d\f[]\f[I]t\f[]\f[I]o\f[]LOAD_PATH.
+specify $LOAD_PATH.  PATH will be prepended to $LOAD_PATH.
 The \[aq]:\[aq] character may be used to delimit multiple directories.
-This directive may be used more than once.
-Modifications to $LOAD_PATH take place immediately and in the order they
-were specified on the command\-line.
+This directive may be used more than once.  Modifications to
+$LOAD_PATH take place immediately and in the order they were
+specified on the command\-line.
 .RS
 .RE
 .TP
 .B \-r, \-\-require LIBRARY
-require a specified LIBRARY before executing the application.
-The "require" statement will be executed immediately and in the order
+require a specified LIBRARY before executing the application.  The
+"require" statement will be executed immediately and in the order
 they were specified on the command\-line.
 .RS
 .RE
@@ -139,15 +137,15 @@ HUP \- reload config file, app, and gracefully restart all workers
 .IP \[bu] 2
 INT/TERM \- quick shutdown, kills all workers immediately
 .IP \[bu] 2
-QUIT \- graceful shutdown, waits for workers to finish their current
-request before finishing.
+QUIT \- graceful shutdown, waits for workers to finish their
+current request before finishing.
 .IP \[bu] 2
-USR1 \- reopen all logs owned by the master and all workers See
-Unicorn::Util.reopen_logs for what is considered a log.
+USR1 \- reopen all logs owned by the master and all workers
+See Unicorn::Util.reopen_logs for what is considered a log.
 .IP \[bu] 2
-USR2 \- reexecute the running binary.
-A separate QUIT should be sent to the original process once the child is
-verified to be up and running.
+USR2 \- reexecute the running binary.  A separate QUIT
+should be sent to the original process once the child is verified to
+be up and running.
 .IP \[bu] 2
 WINCH \- gracefully stops workers but keep the master running.
 This will only work for daemonized processes.
@@ -156,7 +154,7 @@ TTIN \- increment the number of worker processes by one
 .IP \[bu] 2
 TTOU \- decrement the number of worker processes by one
 .PP
-See the SIGNALS (https://bogomips.org/unicorn/SIGNALS.html) document for
+See the SIGNALS (https://yhbt.net/unicorn/SIGNALS.html) document for
 full description of all signals used by Unicorn.
 .SH RACK ENVIRONMENT
 .PP
@@ -164,56 +162,61 @@ Accepted values of RACK_ENV and the middleware they automatically load
 (outside of RACKUP_FILE) are exactly as those in rackup(1):
 .IP \[bu] 2
 development \- loads Rack::CommonLogger, Rack::ShowExceptions, and
-Rack::Lint middleware
+              Rack::Lint middleware
 .IP \[bu] 2
 deployment \- loads Rack::CommonLogger middleware
 .IP \[bu] 2
 none \- loads no middleware at all, relying entirely on RACKUP_FILE
 .PP
-All unrecognized values for RACK_ENV are assumed to be "none".
-Production deployments are strongly encouraged to use "deployment" or
-"none" for maximum performance.
+All unrecognized values for RACK_ENV are assumed to be
+"none".  Production deployments are strongly encouraged to use
+"deployment" or "none" for maximum performance.
 .PP
-As of Unicorn 0.94.0, RACK_ENV is exported as a process\-wide
-environment variable as well.
-While not current a part of the Rack specification as of Rack 1.0.1,
-this has become a de facto standard in the Rack world.
+As of Unicorn 0.94.0, RACK_ENV is exported as a process\-wide environment
+variable as well.  While not current a part of the Rack specification as
+of Rack 1.0.1, this has become a de facto standard in the Rack world.
 .PP
 Note the Rack::ContentLength and Rack::Chunked middlewares are also
 loaded by "deployment" and "development", but no other values of
-RACK_ENV.
-If needed, they must be individually specified in the RACKUP_FILE, some
-frameworks do not require them.
+RACK_ENV.  If needed, they must be individually specified in the
+RACKUP_FILE, some frameworks do not require them.
 .SH ENVIRONMENT VARIABLES
 .PP
 The RACK_ENV variable is set by the aforementioned \-E switch.
-All application or library\-specific environment variables (e.g.
-TMPDIR) may always be set in the Unicorn CONFIG_FILE in addition to the
-spawning shell.
-When transparently upgrading Unicorn, all environment variables set in
-the old master process are inherited by the new master process.
+All application or library\-specific environment variables (e.g. TMPDIR)
+may always be set in the Unicorn CONFIG_FILE in addition to the spawning
+shell.  When transparently upgrading Unicorn, all environment variables
+set in the old master process are inherited by the new master process.
 Unicorn only uses (and will overwrite) the UNICORN_FD environment
 variable internally when doing transparent upgrades.
 .PP
 UNICORN_FD is a comma\-delimited list of one or more file descriptors
-used to implement USR2 upgrades.
-Init systems may bind listen sockets itself and spawn unicorn with
-UNICORN_FD set to the file descriptor numbers of the listen socket(s).
+used to implement USR2 upgrades.  Init systems may bind listen sockets
+itself and spawn unicorn with UNICORN_FD set to the file descriptor
+numbers of the listen socket(s).
 .PP
 As of unicorn 5.0, LISTEN_PID and LISTEN_FDS are used for socket
-activation as documented in the sd_listen_fds(3) manpage.
-Users relying on this feature do not need to specify a listen socket in
+activation as documented in the sd_listen_fds(3) manpage.  Users
+relying on this feature do not need to specify a listen socket in
 the unicorn config file.
 .SH SEE ALSO
 .IP \[bu] 2
 \f[I]Rack::Builder\f[] ri/RDoc
 .IP \[bu] 2
 \f[I]Unicorn::Configurator\f[] ri/RDoc
+.UR https://yhbt.net/unicorn/Unicorn/Configurator.html
+.UE
 .IP \[bu] 2
-Unicorn RDoc (https://bogomips.org/unicorn/)
+unicorn RDoc
+.UR https://yhbt.net/unicorn/
+.UE
 .IP \[bu] 2
-Rack RDoc (http://www.rubydoc.info/github/rack/rack/)
+Rack RDoc
+.UR https://www.rubydoc.info/github/rack/rack/
+.UE
 .IP \[bu] 2
-Rackup HowTo (https://github.com/rack/rack/wiki/tutorial-rackup-howto)
+Rackup HowTo
+.UR https://github.com/rack/rack/wiki/(tutorial)-rackup-howto
+.UE
 .SH AUTHORS
-The Unicorn Community <unicorn-public@bogomips.org>.
+The Unicorn Community <unicorn-public@yhbt.net>.