puma 2.10.2-java → 2.11.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198c788fc20ee4db44015ece6777e118d1abc3b4
-  data.tar.gz: 3d63d1b999599a1615ee7a79f68900019b58e18d
+  metadata.gz: bf7994a32311e61727ffb527e265d075c348d849
+  data.tar.gz: 200de59f737cd887be5a48d7df1f368d24f3d491
 SHA512:
-  metadata.gz: 50d71dab52b51e56c433aed14973f339dd78b141f11a60d15de3870d6afbeb72f82ca706d5a3a5de915f011bced5667de8d1e96bef8da215f046c8b443861893
-  data.tar.gz: e6ff97f2decbbc55ad6fcb7313b108cd5b8f57abb0d01270c833ea4d89038bb9f20928b13cffd48f74aa8f8c4aa9c9052127d8043938d57c259623968c15f371
+  metadata.gz: 5e479c90638847280108c5b4cf92318242ced7c5c1543f985e93ab7bfd02cf595226173bcf3d2614da7b099324ed6c624893122dd7594948b3eb3b94d09b63db
+  data.tar.gz: d84292324d99cafe14dd505d59c21efa14397d75c7b2032c66a4d177dca91a1e212d456708b2a1d2ad99cb2af32f1726f8d55f8badb4e25c1095ce10c8f2b4c3

data/Gemfile

@@ -6,6 +6,7 @@ gem "hoe-ignore"
 gem "rdoc"
 gem "rake-compiler"
 gem "rack"
+gem "test-unit", "~> 3.0"
 
 gem 'minitest', '~> 4.0'
 
@@ -14,4 +15,3 @@ gem "jruby-openssl", :platform => "jruby"
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
 end
-

data/History.txt

@@ -1,3 +1,36 @@
+=== 2.11.0 / 2015-01-20
+
+* 9 bug fixes:
+  * Add mode as an additional bind option to unix sockets. Fixes #630
+  * Advertise HTTPS properly after a hot restart
+  * Don't write lowlevel_error_handler to state
+  * Fix phased restart with stuck requests
+  * Handle spaces in the path properly. Fixes #622
+  * Set a default REMOTE_ADDR to avoid using peeraddr on unix sockets. Fixes #583
+  * Skip device number checking on jruby. Fixes #586
+  * Update extconf.rb to compile correctly on OS X
+  * redirect io right after daemonizing so startup errors are shown. Fixes #359
+
+* 6 minor features:
+  * Add a configuration option that prevents puma from queueing requests.
+  * Add reload_worker_directory
+  * Add the ability to pass environment variables to the init script (for Jungle).
+  * Add the proctitle tag to the worker. Fixes #633
+  * Infer a proctitle tag based on the directory
+  * Update lowlevel error message to be more meaningful.
+
+* 10 PRs merged:
+  * Merge pull request #478 from rubencaro/master
+  * Merge pull request #610 from kwilczynski/master
+  * Merge pull request #611 from jasonl/better-lowlevel-message
+  * Merge pull request #616 from jc00ke/master
+  * Merge pull request #623 from raldred/patch-1
+  * Merge pull request #628 from rdpoor/master
+  * Merge pull request #634 from deepj/master
+  * Merge pull request #637 from raskhadafi/patch-1
+  * Merge pull request #639 from ebeigarts/fix-phased-restarts
+  * Merge pull request #640 from codehotter/issue-612-dependent-requests-deadlock
+
 === 2.10.2 / 2014-11-26
 
 * 1 bug fix:

data/ext/puma_http11/extconf.rb

@@ -2,8 +2,8 @@ require 'mkmf'
 
 dir_config("puma_http11")
 
-if %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')} and
-  %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')}
-
+if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and
+    %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')}
+  
   create_makefile("puma/puma_http11")
 end

data/lib/puma/app/status.rb

@@ -48,6 +48,13 @@ module Puma
             return rack_response(200, OK_STATUS)
           end
 
+        when /\/reload-worker-directory$/
+          if !@cli.reload_worker_directory
+            return rack_response(404, '{ "error": "reload_worker_directory not available" }')
+          else
+            return rack_response(200, OK_STATUS)
+          end
+
         when /\/stats$/
           return rack_response(200, @cli.stats)
         else

data/lib/puma/binder.rb

@@ -98,7 +98,7 @@ module Puma
 
           @listeners << [str, io]
         when "unix"
-          path = "#{uri.host}#{uri.path}"
+          path = "#{uri.host}#{uri.path}".gsub("%20", " ")
 
           if fd = @inherited_fds.delete(str)
             logger.log "* Inherited #{str}"
@@ -107,6 +107,7 @@ module Puma
             logger.log "* Listening on #{str}"
 
             umask = nil
+            mode = nil
 
             if uri.query
               params = Rack::Utils.parse_query uri.query
@@ -114,9 +115,13 @@ module Puma
                 # Use Integer() to respect the 0 prefix as octal
                 umask = Integer(u)
               end
+
+              if u = params['mode']
+                mode = Integer('0'+u)
+              end
             end
 
-            io = add_unix_listener path, umask
+            io = add_unix_listener path, umask, mode
           end
 
           @listeners << [str, io]
@@ -247,13 +252,20 @@ module Puma
     def inherited_ssl_listener(fd, ctx)
       require 'puma/minissl'
       s = TCPServer.for_fd(fd)
-      @ios << MiniSSL::Server.new(s, ctx)
+      ssl = MiniSSL::Server.new(s, ctx)
+
+      env = @proto_env.dup
+      env[HTTPS_KEY] = HTTPS
+      @envs[ssl] = env
+
+      @ios << ssl
+
       s
     end
 
     # Tell the server to listen on +path+ as a UNIX domain socket.
     #
-    def add_unix_listener(path, umask=nil)
+    def add_unix_listener(path, umask=nil, mode=nil)
       @unix_paths << path
 
       # Let anyone connect by default
@@ -279,6 +291,14 @@ module Puma
         File.umask old_mask
       end
 
+      if mode
+        File.chmod mode, path
+      end
+
+      env = @proto_env.dup
+      env[REMOTE_ADDR] = "127.0.0.1"
+      @envs[s] = env
+
       s
     end
 
@@ -292,6 +312,10 @@ module Puma
       end
       @ios << s
 
+      env = @proto_env.dup
+      env[REMOTE_ADDR] = "127.0.0.1"
+      @envs[s] = env
+
       s
     end
 

data/lib/puma/cli.rb

@@ -229,7 +229,7 @@ module Puma
 
         cfg = @config.dup
 
-        [ :logger, :before_worker_shutdown, :before_worker_boot, :after_worker_boot, :on_restart ].each { |o| cfg.options.delete o }
+        [ :logger, :before_worker_shutdown, :before_worker_boot, :after_worker_boot, :on_restart, :lowlevel_error_handler ].each { |o| cfg.options.delete o }
 
         state["config"] = cfg
 
@@ -335,7 +335,7 @@ module Puma
         s_env = File.stat(dir)
         s_pwd = File.stat(Dir.pwd)
 
-        if s_env.ino == s_pwd.ino and s_env.dev == s_pwd.dev
+        if s_env.ino == s_pwd.ino and (jruby? or s_env.dev == s_pwd.dev)
           @restart_dir = dir
           @options[:worker_directory] = dir
         end
@@ -491,7 +491,7 @@ module Puma
       set_rack_environment
 
       if clustered?
-        @events = PidEvents.new STDOUT, STDERR
+        @events.formatter = Events::PidFormatter.new
         @options[:logger] = @events
 
         @runner = Cluster.new(self)
@@ -572,6 +572,10 @@ module Puma
       @runner.restart
     end
 
+    def reload_worker_directory
+      @runner.reload_worker_directory if @runner.respond_to?(:reload_worker_directory)
+    end
+
     def phased_restart
       unless @runner.respond_to?(:phased_restart) and @runner.phased_restart
         log "* phased-restart called but not available, restarting normally."

data/lib/puma/client.rb

@@ -222,6 +222,14 @@ module Puma
       end
     end # IS_JRUBY
 
+    def finish
+      return true if @ready
+      until try_to_finish
+        IO.select([@to_io], nil, nil)
+      end
+      true
+    end
+
     def read_body
       # Read an odd sized chunk so we can read even sized ones
       # after this

data/lib/puma/cluster.rb

@@ -43,12 +43,14 @@ module Puma
     end
 
     class Worker
-      def initialize(idx, pid, phase)
+      def initialize(idx, pid, phase, options)
         @index = idx
         @pid = pid
         @phase = phase
         @stage = :started
         @signal = "TERM"
+        @options = options
+        @first_term_sent = nil
         @last_checkin = Time.now
       end
 
@@ -105,7 +107,7 @@ module Puma
 
         pid = fork { worker(idx, master) }
         @cli.debug "Spawned worker: #{pid}"
-        @workers << Worker.new(idx, pid, @phase)
+        @workers << Worker.new(idx, pid, @phase, @options)
         @options[:after_worker_boot].each { |h| h.call }
       end
 
@@ -180,7 +182,10 @@ module Puma
     end
 
     def worker(index, master)
-      $0 = "puma: cluster worker #{index}: #{master}"
+      title = "puma: cluster worker #{index}: #{master}"
+      title << " [#{@options[:tag]}]" if @options[:tag]
+      $0 = title
+
       Signal.trap "SIGINT", "IGNORE"
 
       @workers = []
@@ -267,6 +272,13 @@ module Puma
       wakeup!
     end
 
+    def reload_worker_directory
+      if dir = @options[:worker_directory]
+        log "+ Changing to #{dir}"
+        Dir.chdir dir
+      end
+    end
+
     def stats
       %Q!{ "workers": #{@workers.size}, "phase": #{@phase}, "booted_workers": #{@workers.count{|w| w.booted?}} }!
     end

data/lib/puma/configuration.rb

@@ -60,6 +60,14 @@ module Puma
       unless @options[:control_auth_token]
         setup_random_token
       end
+
+      unless @options[:tag]
+        @options[:tag] = infer_tag
+      end
+    end
+
+    def infer_tag
+      File.basename Dir.getwd
     end
 
     # Injects the Configuration object into the env
@@ -402,6 +410,23 @@ module Puma
       def worker_shutdown_timeout(timeout)
         @options[:worker_shutdown_timeout] = timeout
       end
+
+      # When set to true (the default), workers accept all requests
+      # and queue them before passing them to the handlers.
+      # When set to false, each worker process accepts exactly as
+      # many requests as it is configured to simultaneously handle.
+      #
+      # Queueing requests generally improves performance. In some
+      # cases, such as a single threaded application, it may be
+      # better to ensure requests get balanced across workers.
+      #
+      # Note that setting this to false disables HTTP keepalive and
+      # slow clients will occupy a handler thread while the request
+      # is being sent. A reverse proxy, such as nginx, can handle
+      # slow clients and queue requests before they reach puma.
+      def queue_requests(answer=true)
+        @options[:queue_requests] = answer
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.10.2".freeze
-    CODE_NAME = "Robots on Comets".freeze
+    PUMA_VERSION = VERSION = "2.11.0".freeze
+    CODE_NAME = "Intrepid Squirrel".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -7,7 +7,7 @@ require 'socket'
 module Puma
   class ControlCLI
 
-    COMMANDS = %w{halt restart phased-restart start stats status stop}
+    COMMANDS = %w{halt restart phased-restart start stats status stop reload-worker-directory}
 
     def is_windows?
       RUBY_PLATFORM =~ /(win|w)32$/ ? true : false
@@ -201,6 +201,10 @@ module Puma
         puts "Stats not available via pid only"
         return
 
+      when "reload-worker-directory"
+        puts "reload-worker-directory not available via pid only"
+        return
+
       when "phased-restart"
         Process.kill "SIGUSR1", pid
 

data/lib/puma/events.rb

@@ -8,12 +8,24 @@ module Puma
   # The methods available are the events that the Server fires.
   #
   class Events
+    class DefaultFormatter
+      def call(str)
+        str
+      end
+    end
+
+    class PidFormatter
+      def call(str)
+        "[#{$$}] #{str}"
+      end
+    end
 
     include Const
 
     # Create an Events object that prints to +stdout+ and +stderr+.
     #
     def initialize(stdout, stderr)
+      @formatter = DefaultFormatter.new
       @stdout = stdout
       @stderr = stderr
 
@@ -28,6 +40,7 @@ module Puma
     end
 
     attr_reader :stdout, :stderr
+    attr_accessor :formatter
 
     # Fire callbacks for the named hook
     #
@@ -52,11 +65,11 @@ module Puma
     # Write +str+ to +@stdout+
     #
     def log(str)
-      @stdout.puts str
+      @stdout.puts format(str)
     end
 
     def write(str)
-      @stdout.write str
+      @stdout.write format(str)
     end
 
     def debug(str)
@@ -66,10 +79,14 @@ module Puma
     # Write +str+ to +@stderr+
     #
     def error(str)
-      @stderr.puts "ERROR: #{str}"
+      @stderr.puts format("ERROR: #{str}")
       exit 1
     end
 
+    def format(str)
+      formatter.call(str)
+    end
+
     # An HTTP parse error has occured.
     # +server+ is the Server object, +env+ the request, and +error+ a
     # parsing exception.
@@ -113,18 +130,4 @@ module Puma
       Events.new $stdout, $stderr
     end
   end
-
-  class PidEvents < Events
-    def log(str)
-      super "[#{$$}] #{str}"
-    end
-
-    def write(str)
-      super "[#{$$}] #{str}"
-    end
-
-    def error(str)
-      super "[#{$$}] #{str}"
-    end
-  end
 end

data/lib/puma/server.rb

@@ -74,6 +74,7 @@ module Puma
       @leak_stack_on_error = true
 
       @options = options
+      @queue_requests = options[:queue_requests].nil? ? true : options[:queue_requests]
 
       ENV['RACK_ENV'] ||= "development"
 
@@ -235,13 +236,20 @@ module Puma
         return run_lopez_mode(background)
       end
 
+      queue_requests = @queue_requests
+
       @thread_pool = ThreadPool.new(@min_threads,
                                     @max_threads,
                                     IOBuffer) do |client, buffer|
         process_now = false
 
         begin
-          process_now = client.eagerly_finish
+          if queue_requests
+            process_now = client.eagerly_finish
+          else
+            client.finish
+            process_now = true
+          end
         rescue HttpParserError => e
           client.write_400
           client.close
@@ -261,9 +269,10 @@ module Puma
 
       @thread_pool.clean_thread_locals = @options[:clean_thread_locals]
 
-      @reactor = Reactor.new self, @thread_pool
-
-      @reactor.run_in_thread
+      if queue_requests
+        @reactor = Reactor.new self, @thread_pool
+        @reactor.run_in_thread
+      end
 
       if @auto_trim_time
         @thread_pool.auto_trim!(@auto_trim_time)
@@ -284,6 +293,7 @@ module Puma
         check = @check
         sockets = [check] + @binder.ios
         pool = @thread_pool
+        queue_requests = @queue_requests
 
         while @status == :run
           begin
@@ -296,6 +306,7 @@ module Puma
                   if io = sock.accept_nonblock
                     client = Client.new io, @binder.env(sock)
                     pool << client
+                    pool.wait_until_not_full unless queue_requests
                   end
                 rescue SystemCallError
                 end
@@ -312,9 +323,10 @@ module Puma
         @events.fire :state, @status
 
         graceful_shutdown if @status == :stop || @status == :restart
-        @reactor.clear! if @status == :restart
-
-        @reactor.shutdown
+        if queue_requests
+          @reactor.clear! if @status == :restart
+          @reactor.shutdown
+        end
       rescue Exception => e
         STDERR.puts "Exception handling servers: #{e.message} (#{e.class})"
         STDERR.puts e.backtrace
@@ -367,6 +379,7 @@ module Puma
             close_socket = false
             return
           when true
+            return unless @queue_requests
             buffer.reset
 
             unless client.reset(@status == :run)
@@ -443,12 +456,14 @@ module Puma
       # intermediary acting on behalf of the actual source client."
       #
 
-      addr = client.peeraddr.last
+      unless env.key?(REMOTE_ADDR)
+        addr = client.peeraddr.last
 
-      # Set unix socket addrs to localhost
-      addr = "127.0.0.1" if addr.empty?
+        # Set unix socket addrs to localhost
+        addr = "127.0.0.1" if addr.empty?
 
-      env[REMOTE_ADDR] = addr
+        env[REMOTE_ADDR] = addr
+      end
     end
 
     def default_server_port(env)
@@ -716,7 +731,7 @@ module Puma
       if @leak_stack_on_error
         [500, {}, ["Puma caught this error: #{e.message} (#{e.class})\n#{e.backtrace.join("\n")}"]]
       else
-        [500, {}, ["A really lowlevel plumbing error occured. Please contact your local Maytag(tm) repair person.\n"]]
+        [500, {}, ["An unhandled lowlevel error occured. The application logs may have details.\n"]]
       end
     end
 

data/lib/puma/single.rb

@@ -73,6 +73,7 @@ module Puma
         if daemon?
           log "* Daemonizing..."
           Process.daemon(true)
+          redirect_io
         end
 
         load_and_bind
@@ -84,12 +85,11 @@ module Puma
 
       @server = server = start_server
 
-      unless @options[:daemon]
+      unless daemon?
         log "Use Ctrl-C to stop"
+        redirect_io
       end
 
-      redirect_io
-
       @cli.events.fire_on_booted!
 
       begin

data/lib/puma/thread_pool.rb

@@ -12,7 +12,8 @@ module Puma
     # thread.
     #
     def initialize(min, max, *extra, &block)
-      @cond = ConditionVariable.new
+      @not_empty = ConditionVariable.new
+      @not_full = ConditionVariable.new
       @mutex = Mutex.new
 
       @todo = []
@@ -60,7 +61,8 @@ module Puma
         todo  = @todo
         block = @block
         mutex = @mutex
-        cond  = @cond
+        not_empty = @not_empty
+        not_full = @not_full
 
         extra = @extra.map { |i| i.new }
 
@@ -83,7 +85,8 @@ module Puma
               end
 
               @waiting += 1
-              cond.wait mutex
+              not_full.signal
+              not_empty.wait mutex
               @waiting -= 1
             end
 
@@ -127,7 +130,15 @@ module Puma
           spawn_thread
         end
 
-        @cond.signal
+        @not_empty.signal
+      end
+    end
+
+    def wait_until_not_full
+      @mutex.synchronize do
+        until @todo.size - @waiting < @max - @spawned or @shutdown
+          @not_full.wait @mutex
+        end
       end
     end
 
@@ -139,7 +150,7 @@ module Puma
       @mutex.synchronize do
         if (force or @waiting > 0) and @spawned - @trim_requested > @min
           @trim_requested += 1
-          @cond.signal
+          @not_empty.signal
         end
       end
     end
@@ -178,7 +189,8 @@ module Puma
     def shutdown
       @mutex.synchronize do
         @shutdown = true
-        @cond.broadcast
+        @not_empty.broadcast
+        @not_full.broadcast
 
         @auto_trim.stop if @auto_trim
       end

data/lib/rack/handler/puma.rb

@@ -59,8 +59,3 @@ module Rack
   end
 end
 
-# This is to trick newrelic into enabling the agent automatically.
-module Mongrel
-  class HttpServer
-  end
-end

data/test/test_integration.rb

@@ -102,6 +102,47 @@ class TestIntegration < Test::Unit::TestCase
     assert_kind_of Thread, t.join(1), "server didn't stop"
   end
 
+  def notest_phased_restart_via_pumactl
+    if defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
+      assert true
+      return
+    end
+
+    cli = Puma::CLI.new %W!-q -S #{@state_path} -b unix://#{@bind_path} --control unix://#{@control_path} -w 2 test/hello-stuck.ru!, @events
+    cli.options[:worker_shutdown_timeout] = 1
+
+    t = Thread.new do
+      cli.run
+    end
+
+    wait_booted
+
+    # Make both workers stuck
+    s1 = UNIXSocket.new @bind_path
+    s1 << "GET / HTTP/1.0\r\n\r\n"
+    s2 = UNIXSocket.new @bind_path
+    s2 << "GET / HTTP/1.0\r\n\r\n"
+
+    sout = StringIO.new
+
+    # Phased restart
+    ccli = Puma::ControlCLI.new %W!-S #{@state_path} phased-restart!, sout
+    ccli.run
+    sleep 20
+    @events.stdout.rewind
+    log = @events.stdout.readlines.join("")
+    assert_match(/TERM sent/, log)
+    assert_match(/KILL sent/, log)
+    assert_match(/Worker 0 \(pid: \d+\) booted, phase: 1/, log)
+    assert_match(/Worker 1 \(pid: \d+\) booted, phase: 1/, log)
+
+    # Stop
+    ccli = Puma::ControlCLI.new %W!-S #{@state_path} stop!, sout
+    ccli.run
+
+    assert_kind_of Thread, t.join(5), "server didn't stop"
+  end
+
   def notest_restart_closes_keepalive_sockets
     server("-q test/hello.ru")
 

data/tools/jungle/init.d/puma

@@ -47,7 +47,8 @@ do_start() {
     if [ "$log_file" = "" ]; then
       log_file="$dir/log/puma.log"
     fi
-    do_start_one $dir $user $config_file $log_file
+    environment=`echo $i | cut -d , -f 5`
+    do_start_one $dir $user $config_file $log_file $environment
   done
 }
 
@@ -57,12 +58,12 @@ do_start_one() {
     PID=`cat $PIDFILE`
     # If the puma isn't running, run it, otherwise restart it.
     if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2 $3 $4
+      do_start_one_do $1 $2 $3 $4 $5
     else
       do_restart_one $1
     fi
   else
-    do_start_one_do $1 $2 $3 $4
+    do_start_one_do $1 $2 $3 $4 $5
   fi
 }
 
@@ -70,6 +71,14 @@ do_start_one_do() {
   log_daemon_msg "--> Woke up puma $1"
   log_daemon_msg "user $2"
   log_daemon_msg "log to $4"
+
+  if [ ! -z "$5" ]; then
+    for e in $(echo "$5" | tr ';' '\n'); do
+        log_daemon_msg "environment $e"
+        v=${e%%\=*} ;  eval "$e" ; export $v
+    done
+  fi
+
   start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
 }
 
@@ -140,7 +149,8 @@ do_restart_one() {
     if [ "$log_file" = "" ]; then
       log_file="$dir/log/puma.log"
     fi
-    do_start_one $dir $user $config_file $log_file
+    environment=`echo $i | cut -d , -f 5`
+    do_start_one $dir $user $config_file $log_file $environment
   fi
 	return 0
 }
@@ -209,6 +219,11 @@ do_add() {
     str="$str,$4"
   fi
 
+  # Environment variables
+  if [ "$5" != "" ]; then
+    str="$str,$5"
+  fi
+
   # Add it to the jungle 
   echo $str >> $CONFIG
   log_daemon_msg "Added a Puma to the jungle: $str. You still have to start it though."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement