puma 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec0eeb5886074470b19df49db748d9fad55c57c6
-  data.tar.gz: 74521d8b05a10a149cf6aa0fb4dc4c7e199ab124
+  metadata.gz: 3aaeb164dd6e399e4155a81117c4ad6cde4a0420
+  data.tar.gz: d040b98c0015ce89e4d5c7d793a488eace1d6422
 SHA512:
-  metadata.gz: d64e58108913abf1b2252ba3038553ec28c82cfe96aa8812de7bdc58215881aea90a1048b490cee8699df99c73f3ea2b9d1dd3b472d082fbcc7974003c79e16c
-  data.tar.gz: 35befe3e0a9d01fa14f58841ecbcef2fa84a99ba8b3c564ceacb99101e52d50a855c7ab65c983caf816a09bf5547fb35b4e6f111985bea1cb5940e46a01b4dc8
+  metadata.gz: aa50dc14fdac0d976b3f0e480039f301aad9c09cd898eb0fc8c901f900b5f1167ff50818d10c68601c8a70122a7ae865b75f5702c83425cd6005ecca11862236
+  data.tar.gz: e2da1eb6e42bdad2925391be65b152af26ac784f70dcbc1c4074cd0a269eff58e6b2cc22572b60febc46777a488bfca402b71ed0f1dcbcbe6655b561d7460543

data/Gemfile

@@ -8,6 +8,6 @@ gem "rake-compiler"
 gem "test-unit", "~> 3.0"
 
 gem "rack"
-gem 'minitest', '~> 4.0'
+gem 'minitest', '~> 5.8'
 
 gem "jruby-openssl", :platform => "jruby"

data/History.txt

@@ -1,3 +1,53 @@
+=== 3.0.0 / 2016-02-25
+
+* 2 major changes:
+
+  * Ruby pre-2.0 is no longer supported. We'll do our best to not add
+    features that break those rubies but will no longer be testing
+    with them.
+  * Don't log requests by default. Fixes #852
+
+* 2 major features:
+
+  * Plugin support! Plugins can interact with configuration as well
+    as provide augment server functionality!
+  * Experimental env['async.callback'] support
+
+* 4 minor features:
+
+  * Listen to unix socket with provided backlog if any
+  * Improves the clustered stats to report worker stats
+  * Pass the env to the lowlevel_error handler. Fixes #854
+  * Treat path-like hosts as unix sockets. Fixes #824
+
+* 5 bug fixes:
+
+  * Clean thread locals when using keepalive. Fixes #823
+  * Cleanup compiler warnings. Fixes #815
+  * Expose closed? for use by the reactor. Fixes #835
+  * Move signal handlers to separate method to prevent space leak. Fixes #798
+  * Signal not full on worker exit #876
+
+* 5 doc fixes:
+
+  * Update README.md with various grammar fixes
+  * Use newest version of Minitest
+  * Add directory configuration docs, fix typo [ci skip]
+  * Remove old COPYING notice. Fixes #849
+
+* 10 merged PRs:
+
+  * Merge pull request #871 from deepj/travis
+  * Merge pull request #874 from wallclockbuilder/master
+  * Merge pull request #883 from dadah89/igor/trim_only_worker
+  * Merge pull request #884 from uistudio/async-callback
+  * Merge pull request #888 from mlarraz/tick_minitest
+  * Merge pull request #890 from todd/directory_docs
+  * Merge pull request #891 from ctaintor/improve_clustered_status
+  * Merge pull request #893 from spastorino/add_missing_require
+  * Merge pull request #897 from zendesk/master
+  * Merge pull request #899 from kch/kch-readme-fixes
+
 === 2.16.0 / 2016-01-27
 
 * 7 minor features:

data/Manifest.txt

@@ -1,4 +1,3 @@
-COPYING
 DEPLOYMENT.md
 Gemfile
 History.txt

data/README.md

@@ -74,7 +74,7 @@ Puma utilizes a dynamic thread pool which you can modify. You can set the minimu
 
     $ puma -t 8:32
 
-Puma will automatically scale the number of threads based on how much traffic is present. The current default is `0:16`. Feel free to experiment, but be careful not to set the number of maximum threads to a very large number, as you may exhaust resources on the system (or hit resource limits).
+Puma will automatically scale the number of threads, from the minimum until it caps out at the maximum, based on how much traffic is present. The current default is `0:16`. Feel free to experiment, but be careful not to set the number of maximum threads to a very large number, as you may exhaust resources on the system (or hit resource limits).
 
 ### Clustered mode
 
@@ -111,7 +111,7 @@ you to do some Puma-specific things that you don't want to embed in your applica
 For instance, you could fire a log notification that a worker booted or send something to statsd.
 This can be called multiple times to add hooks.
 
-If you're preloading your application and using ActiveRecord, it's recommend you setup your connection pool here:
+If you're preloading your application and using ActiveRecord, it's recommended that you setup your connection pool here:
 
     # config/puma.rb
     on_worker_boot do
@@ -130,7 +130,7 @@ On top of that, you can specify a block in your configuration file that will be
 This code can be used to clean up before forking to clients, allowing
 you to do some Puma-specific things that you don't want to embed in your application.
 
-If you're preloading your application and using ActiveRecord, it's recommend you close any connections to the database here to prevent connection leakage:
+If you're preloading your application and using ActiveRecord, it's recommended that you close any connections to the database here to prevent connection leakage:
 
     # config/puma.rb
     before_fork do
@@ -139,7 +139,7 @@ If you're preloading your application and using ActiveRecord, it's recommend you
 
 This rule applies to any connections to external services (Redis, databases, memcache, ...) that might be started automatically by the framework.
 
-When you use preload_app, your new code goes all in the master process, and is then copied in the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
+When you use preload_app, all of your new code goes into the master process, and is then copied into the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
 
 Note that preload_app can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preload_app is all about copying the code of master into the workers.
 
@@ -177,7 +177,7 @@ Need a bit of security? Use SSL sockets!
 
 ### Control/Status Server
 
-Puma comes with a builtin status/control app that can be used query and control Puma itself. Here is an example of starting Puma with the control server:
+Puma comes with a builtin status/control app that can be used to query and control Puma itself. Here is an example of starting Puma with the control server:
 
     $ puma --control tcp://127.0.0.1:9293 --control-token foo
 
@@ -212,26 +212,35 @@ If the new process is unable to load, it will simply exit. You should therefore
 
 ### Normal vs Hot vs Phased Restart
 
-A hot restart means that no requests while deploying your new code will be lost, since the server socket is kept open between restarts.
+A hot restart means that no requests will be lost while deploying your new code, since the server socket is kept open between restarts.
 
 But beware, hot restart does not mean that the incoming requests won’t hang for multiple seconds while your new code has not fully deployed. If you need a zero downtime and zero hanging requests deploy, you must use phased restart.
 
-When you run pumactl phased-restart, Puma kills workers one-by-one, meaning that at least another worker is still available to serve requests, which lead in zero hanging request (yay!).
+When you run pumactl phased-restart, Puma kills workers one-by-one, meaning that at least another worker is still available to serve requests, which lead to zero hanging requests (yay!).
 
 But again beware, upgrading an application sometimes involves upgrading the database schema. With phased restart, there may be a moment during the deployment where processes belonging to the previous version and processes belonging to the new version both exist at the same time. Any database schema upgrades you perform must therefore be backwards-compatible with the old application version.
 
-if you perform a lot of database migrations, you probably should not use phased restart and use a normal/hot restart instead (pumactl restart). That way, no code is shared while deploying (in that case, preload_app might help for quicker deployment, see below).
+If you perform a lot of database migrations, you probably should not use phased restart and use a normal/hot restart instead (pumactl restart). That way, no code is shared while deploying (in that case, preload_app might help for quicker deployment, see below).
 
+### Release Directory
+
+If you symlink releases into a common working directory (i.e., `/current` from Capistrano), Puma won't pick up your new changes when running phased restarts without additional configuration. You should set your working directory within Puma's config to specify the directory it should use. This is a change from earlier versions of Puma (< 2.15) that would infer the directory for you.
+
+```ruby
+# config/puma.rb
+
+directory '/var/www/current'
+```
 
 ### Cleanup Code
 
 Puma isn't able to understand all the resources that your app may use, so it provides a hook in the configuration file you pass to `-C` called `on_restart`. The block passed to `on_restart` will be called, unsurprisingly, just before Puma restarts itself.
 
-You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restart many times.
+You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restarted many times.
 
 ### Platform Constraints
 
-Because of various platforms not being implement certain things, the following differences occur when Puma is used on different platforms:
+Because of various platforms not being able to implement certain things, the following differences occur when Puma is used on different platforms:
 
   * **JRuby**, **Windows**: server sockets are not seamless on restart, they must be closed and reopened. These platforms have no way to pass descriptors into a new process that is exposed to ruby
   * **JRuby**, **Windows**: cluster mode is not supported due to a lack of  fork(2)
@@ -243,7 +252,7 @@ Because of various platforms not being implement certain things, the following d
 
 ## Managing multiple Pumas / init.d / upstart scripts
 
-If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for init.d and upstart scripts.
+If you want an easy way to manage multiple scripts at once, check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for init.d and upstart scripts.
 
 ## Capistrano deployment
 
@@ -284,4 +293,4 @@ $ bundle exec rake
 
 ## License
 
-Puma is copyright 2014 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the include LICENSE file for details.
+Puma is copyright 2014 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the included LICENSE file for details.

data/ext/puma_http11/io_buffer.c

@@ -116,7 +116,7 @@ static VALUE buf_to_str(VALUE self) {
   struct buf_int* b;
   Data_Get_Struct(self, struct buf_int, b);
 
-  return rb_str_new(b->top, b->cur - b->top);
+  return rb_str_new((const char*)(b->top), b->cur - b->top);
 }
 
 static VALUE buf_used(VALUE self) {

data/ext/puma_http11/mini_ssl.c

@@ -1,7 +1,13 @@
 #define RSTRING_NOT_MODIFIED 1
 
 #include <ruby.h>
+#include <ruby/version.h>
+
+#if RUBY_API_VERSION_MAJOR == 1
 #include <rubyio.h>
+#else
+#include <ruby/io.h>
+#endif
 
 #ifdef HAVE_OPENSSL_BIO_H
 
@@ -347,7 +353,7 @@ VALUE engine_peercert(VALUE self) {
     }
   }
 
-  rb_cert_buf = rb_str_new(buf, bytes);
+  rb_cert_buf = rb_str_new((const char*)(buf), bytes);
   if(!cert_buf) {
     OPENSSL_free(buf);
   }

data/lib/puma/binder.rb

@@ -111,6 +111,7 @@ module Puma
 
             umask = nil
             mode = nil
+            backlog = nil
 
             if uri.query
               params = Util.parse_query uri.query
@@ -122,9 +123,13 @@ module Puma
               if u = params['mode']
                 mode = Integer('0'+u)
               end
+
+              if u = params['backlog']
+                backlog = Integer(u)
+              end
             end
 
-            io = add_unix_listener path, umask, mode
+            io = add_unix_listener path, umask, mode, backlog
           end
 
           @listeners << [str, io]
@@ -298,7 +303,7 @@ module Puma
 
     # Tell the server to listen on +path+ as a UNIX domain socket.
     #
-    def add_unix_listener(path, umask=nil, mode=nil)
+    def add_unix_listener(path, umask=nil, mode=nil, backlog=nil)
       @unix_paths << path
 
       # Let anyone connect by default
@@ -319,6 +324,7 @@ module Puma
         end
 
         s = UNIXServer.new(path)
+        s.listen backlog if backlog
         @ios << s
       ensure
         File.umask old_mask

data/lib/puma/cli.rb

@@ -147,10 +147,14 @@ module Puma
             c.prune_bundler
           end
 
-          o.on "-q", "--quiet", "Quiet down the output" do
+          o.on "-q", "--quiet", "Do not log requests internally (default true)" do
             c.quiet
           end
 
+          o.on "-v", "--log-requests", "Log requests as they occur" do
+            c.log_requests
+          end
+
           o.on "-R", "--restart-cmd CMD",
             "The puma command to run during a hot restart",
             "Default: inferred" do |cmd|

data/lib/puma/client.rb

@@ -7,6 +7,7 @@ class IO
 end
 
 require 'puma/detect'
+require 'puma/delegation'
 
 if Puma::IS_JRUBY
   # We have to work around some OpenSSL buffer/io-readiness bugs
@@ -21,6 +22,7 @@ module Puma
 
   class Client
     include Puma::Const
+    extend  Puma::Delegation
 
     def initialize(io, env=nil)
       @io = io
@@ -57,6 +59,8 @@ module Puma
 
     attr_accessor :remote_addr_header
 
+    forward :closed?, :@io
+
     def inspect
       "#<Puma::Client:0x#{object_id.to_s(16)} @ready=#{@ready.inspect}>"
     end

data/lib/puma/cluster.rb

@@ -52,10 +52,11 @@ module Puma
         @options = options
         @first_term_sent = nil
         @last_checkin = Time.now
+        @last_status = '{}'
         @dead = false
       end
 
-      attr_reader :index, :pid, :phase, :signal, :last_checkin
+      attr_reader :index, :pid, :phase, :signal, :last_checkin, :last_status
 
       def booted?
         @stage == :booted
@@ -74,8 +75,9 @@ module Puma
         @dead = true
       end
 
-      def ping!
+      def ping!(status)
         @last_checkin = Time.now
+        @last_status = status
       end
 
       def ping_timeout?(which)
@@ -238,11 +240,14 @@ module Puma
       end
 
       Thread.new(@worker_write) do |io|
-        payload = "p#{Process.pid}\n"
+        base_payload = "p#{Process.pid}"
 
         while true
           sleep 5
           begin
+            b = server.backlog
+            r = server.running
+            payload = %Q!#{base_payload}{ "backlog":#{b}, "running":#{r} }\n!
             io << payload
           rescue IOError
             break
@@ -301,13 +306,47 @@ module Puma
     def stats
       old_worker_count = @workers.count { |w| w.phase != @phase }
       booted_worker_count = @workers.count { |w| w.booted? }
-      %Q!{ "workers": #{@workers.size}, "phase": #{@phase}, "booted_workers": #{booted_worker_count}, "old_workers": #{old_worker_count} }!
+      worker_status = '[' + @workers.map{ |w| %Q!{ "pid": #{w.pid}, "index": #{w.index}, "phase": #{w.phase}, "booted": #{w.booted?}, "last_checkin": "#{w.last_checkin.utc.iso8601}", "last_status": #{w.last_status} }!}.join(",") + ']'
+      %Q!{ "workers": #{@workers.size}, "phase": #{@phase}, "booted_workers": #{booted_worker_count}, "old_workers": #{old_worker_count}, "worker_status": #{worker_status} }!
     end
 
     def preload?
       @options[:preload_app]
     end
 
+    # We do this in a separate method to keep the lambad scope
+    # of the signals handlers as small as possible.
+    def setup_signals
+      Signal.trap "SIGCHLD" do
+        wakeup!
+      end
+
+      Signal.trap "TTIN" do
+        @options[:workers] += 1
+        wakeup!
+      end
+
+      Signal.trap "TTOU" do
+        @options[:workers] -= 1 if @options[:workers] >= 2
+        @workers.last.term
+        wakeup!
+      end
+
+      master_pid = Process.pid
+
+      Signal.trap "SIGTERM" do
+        # The worker installs their own SIGTERM when booted.
+        # Until then, this is run by the worker and the worker
+        # should just exit if they get it.
+        if Process.pid != master_pid
+          log "Early termination of worker"
+          exit! 0
+        else
+          stop
+        end
+      end
+    end
+
     def run
       @status = :run
 
@@ -347,34 +386,7 @@ module Puma
 
       read, @wakeup = Puma::Util.pipe
 
-      Signal.trap "SIGCHLD" do
-        wakeup!
-      end
-
-      Signal.trap "TTIN" do
-        @options[:workers] += 1
-        wakeup!
-      end
-
-      Signal.trap "TTOU" do
-        @options[:workers] -= 1 if @options[:workers] >= 2
-        @workers.last.term
-        wakeup!
-      end
-
-      master_pid = Process.pid
-
-      Signal.trap "SIGTERM" do
-        # The worker installs their own SIGTERM when booted.
-        # Until then, this is run by the worker and the worker
-        # should just exit if they get it.
-        if Process.pid != master_pid
-          log "Early termination of worker"
-          exit! 0
-        else
-          stop
-        end
-      end
+      setup_signals
 
       # Used by the workers to detect if the master process dies.
       # If select says that @check_pipe is ready, it's because the
@@ -420,7 +432,8 @@ module Puma
 
               next if !req || req == "!"
 
-              pid = read.gets.to_i
+              result = read.gets
+              pid = result.to_i
 
               if w = @workers.find { |x| x.pid == pid }
                 case req
@@ -432,7 +445,7 @@ module Puma
                   w.dead!
                   force_check = true
                 when "p"
-                  w.ping!
+                  w.ping!(result.sub(/^\d+/,'').chomp)
                 end
               else
                 log "! Out-of-sync worker list, no #{pid} worker"

data/lib/puma/configuration.rb

@@ -165,7 +165,7 @@ module Puma
       {
         :min_threads => 0,
         :max_threads => 16,
-        :quiet => false,
+        :log_requests => false,
         :debug => false,
         :binds => ["tcp://#{DefaultTCPHost}:#{DefaultTCPPort}"],
         :workers => 0,
@@ -242,10 +242,10 @@ module Puma
         require 'puma/tcp_logger'
 
         logger = @options[:logger]
-        return TCPLogger.new(logger, found, @options[:quiet])
+        return TCPLogger.new(logger, found, @options[:log_requests])
       end
 
-      if !@options[:quiet] and @options[:environment] == "development"
+      if @options[:log_requests]
         logger = @options[:logger]
         found = CommonLogger.new(found, logger)
       end

data/lib/puma/const.rb

@@ -99,8 +99,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.0.0.rc1".freeze
-    CODE_NAME = "Schneems Sleak Shoes".freeze
+    PUMA_VERSION = VERSION = "3.0.0".freeze
+    CODE_NAME = "Plethora of Penguin Pinatas".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -1,9 +1,9 @@
 require 'optparse'
 require 'puma/const'
 require 'puma/configuration'
-require 'yaml'
 require 'uri'
 require 'socket'
+
 module Puma
   class ControlCLI
 

data/lib/puma/dsl.rb

@@ -160,8 +160,14 @@ module Puma
 
     # Disable request logging.
     #
-    def quiet
-      @options[:quiet] = true
+    def quiet(which=true)
+      @options[:log_requests] = !which
+    end
+
+    # Enable request logging
+    #
+    def log_requests(which=true)
+      @options[:log_requests] = which
     end
 
     # Show debugging info

data/lib/puma/server.rb

@@ -399,6 +399,7 @@ module Puma
     #
     def process_client(client, buffer)
       begin
+        clean_thread_locals = @options[:clean_thread_locals]
         close_socket = true
 
         while true
@@ -412,6 +413,8 @@ module Puma
             return unless @queue_requests
             buffer.reset
 
+            ThreadPool.clean_thread_locals if clean_thread_locals
+
             unless client.reset(@status == :run)
               close_socket = false
               client.set_timeout @persistent_timeout
@@ -517,63 +520,20 @@ module Puma
       env['HTTP_X_FORWARDED_PROTO'] == 'https' ? PORT_443 : PORT_80
     end
 
-    # Given the request +env+ from +client+ and a partial request body
-    # in +body+, finish reading the body if there is one and invoke
-    # the rack app. Then construct the response and write it back to
-    # +client+
-    #
-    # +cl+ is the previously fetched Content-Length header if there
-    # was one. This is an optimization to keep from having to look
-    # it up again.
-    #
-    def handle_request(req, lines)
-      env = req.env
+    def handle_app_response(req, lines, env, status, headers, res_body)
       client = req.io
 
-      normalize_env env, req
-
-      env[PUMA_SOCKET] = client
-
-      if env[HTTPS_KEY] && client.peercert
-        env[PUMA_PEERCERT] = client.peercert
-      end
-
-      env[HIJACK_P] = true
-      env[HIJACK] = req
-
       body = req.body
 
       head = env[REQUEST_METHOD] == HEAD
 
-      env[RACK_INPUT] = body
-      env[RACK_URL_SCHEME] =  env[HTTPS_KEY] ? HTTPS : HTTP
-
       # A rack extension. If the app writes #call'ables to this
       # array, we will invoke them when the request is done.
       #
-      after_reply = env[RACK_AFTER_REPLY] = []
+      # (This is already initialized in `handle_request`, just getting here)
+      after_reply = env[RACK_AFTER_REPLY]
 
       begin
-        begin
-          status, headers, res_body = @app.call(env)
-
-          return :async if req.hijacked
-
-          status = status.to_i
-
-          if status == -1
-            unless headers.empty? and res_body == []
-              raise "async response must have empty headers and body"
-            end
-
-            return :async
-          end
-        rescue StandardError => e
-          @events.unknown_error self, e, "Rack app"
-
-          status, headers, res_body = lowlevel_error(e)
-        end
-
         content_length = nil
         no_body = head
 
@@ -715,6 +675,75 @@ module Puma
       return keep_alive
     end
 
+    # Given the request +env+ from +client+ and a partial request body
+    # in +body+, finish reading the body if there is one and invoke
+    # the rack app. Then construct the response and write it back to
+    # +client+
+    #
+    # +cl+ is the previously fetched Content-Length header if there
+    # was one. This is an optimization to keep from having to look
+    # it up again.
+    #
+    def handle_request(req, lines)
+      env = req.env
+      client = req.io
+
+      normalize_env env, req
+
+      env[PUMA_SOCKET] = client
+
+      if env[HTTPS_KEY] && client.peercert
+        env[PUMA_PEERCERT] = client.peercert
+      end
+
+      env[HIJACK_P] = true
+      env[HIJACK] = req
+
+      env['async.callback'] = lambda { |__response|
+        _status, _headers, _res_body = __response
+        # Faye websocket gem also calls this (when available)
+        # with status=101, and res_body being a stream
+        # but calling here just finishes the response
+        # that's why we only response if the request is not
+        # hijacked. not sure if this is a correct solution
+        # but working. for now.
+        unless req.hijacked
+          handle_app_response(req, lines, env, _status, _headers, _res_body)
+        end
+      }
+
+      body = req.body
+
+      env[RACK_INPUT] = body
+      env[RACK_URL_SCHEME] =  env[HTTPS_KEY] ? HTTPS : HTTP
+
+      env[RACK_AFTER_REPLY] = []
+
+      begin
+        status, headers, res_body = @app.call(env)
+
+        return :async if req.hijacked
+
+        status = status.to_i
+
+        if status == -1
+          # unless headers.empty? and res_body == []
+          #   puts "HEADERS: ".white.on_green + headers.inspect
+          #   puts "BODY: ".white.on_green + res_body.inspect
+          #   raise "async response must have empty headers and body"
+          # end
+
+          return :async
+        end
+      rescue StandardError => e
+        @events.unknown_error self, e, "Rack app"
+
+        status, headers, res_body = lowlevel_error(e, env)
+      end
+
+      return handle_app_response(req, lines, env, status, headers, res_body)
+    end
+
     def fetch_status_code(status)
       HTTP_STATUS_CODES.fetch(status) { 'CUSTOM' }
     end
@@ -776,9 +805,13 @@ module Puma
 
     # A fallback rack response if +@app+ raises as exception.
     #
-    def lowlevel_error(e)
+    def lowlevel_error(e, env)
       if handler = @options[:lowlevel_error_handler]
-        return handler.call(e)
+        if handler.arity == 1
+          return handler.call(e)
+        else
+          return handler.call(e, env)
+        end
       end
 
       if @leak_stack_on_error

data/lib/puma/state_file.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Puma
   class StateFile
     def initialize

data/lib/puma/thread_pool.rb

@@ -45,6 +45,12 @@ module Puma
     attr_reader :spawned, :trim_requested
     attr_accessor :clean_thread_locals
 
+    def self.clean_thread_locals
+      Thread.current.keys.each do |key|
+        Thread.current[key] = nil unless key == :__recursive_key__
+      end
+    end
+
     # How many objects have yet to be processed by the pool?
     #
     def backlog
@@ -77,6 +83,7 @@ module Puma
               if @trim_requested > 0
                 @trim_requested -= 1
                 continue = false
+                not_full.signal
                 break
               end
 
@@ -97,9 +104,7 @@ module Puma
           break unless continue
 
           if @clean_thread_locals
-            Thread.current.keys.each do |key|
-              Thread.current[key] = nil unless key == :__recursive_key__
-            end
+            ThreadPool.clean_thread_locals
           end
 
           begin

data/lib/rack/handler/puma.rb

@@ -13,6 +13,8 @@ module Rack
         options  = DEFAULT_OPTIONS.merge(options)
 
         conf = ::Puma::Configuration.new do |c|
+          c.quiet
+
           if options.delete(:Verbose)
             app = Rack::CommonLogger.new(app, STDOUT)
           end
@@ -26,10 +28,16 @@ module Rack
             c.threads min, max
           end
 
-          host = options[:Host] || ::Puma::Configuration::DefaultTCPHost
-          port = options[:Port] || ::Puma::Configuration::DefaultTCPPort
+          host = options[:Host]
+
+          if host && (host[0,1] == '.' || host[0,1] == '/')
+            c.bind "unix://#{host}"
+          else
+            host ||= ::Puma::Configuration::DefaultTCPHost
+            port = options[:Port] || ::Puma::Configuration::DefaultTCPPort
 
-          c.port port, host
+            c.port port, host
+          end
 
           c.app app
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -95,7 +95,6 @@ extra_rdoc_files:
 - tools/jungle/init.d/README.md
 - tools/jungle/upstart/README.md
 files:
-- COPYING
 - DEPLOYMENT.md
 - Gemfile
 - History.txt
@@ -191,9 +190,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/COPYING

@@ -1,55 +0,0 @@
-Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
-<zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
-either the terms of the GPL or the conditions below:
-
-1. You may make and give away verbatim copies of the source form of the
-   software without restriction, provided that you duplicate all of the
-   original copyright notices and associated disclaimers.
-
-2. You may modify your copy of the software in any way, provided that
-   you do at least ONE of the following:
-
-     a) place your modifications in the Public Domain or otherwise make them
-     Freely Available, such as by posting said modifications to Usenet or an
-     equivalent medium, or by allowing the author to include your
-     modifications in the software.
-
-     b) use the modified software only within your corporation or
-        organization.
-
-     c) rename any non-standard executables so the names do not conflict with
-     standard executables, which must also be provided.
-
-     d) make other distribution arrangements with the author.
-
-3. You may distribute the software in object code or executable
-   form, provided that you do at least ONE of the following:
-
-     a) distribute the executables and library files of the software,
-     together with instructions (in the manual page or equivalent) on where
-     to get the original distribution.
-
-     b) accompany the distribution with the machine-readable source of the
-     software.
-
-     c) give non-standard executables non-standard names, with
-        instructions on where to get the original software distribution.
-
-     d) make other distribution arrangements with the author.
-
-4. You may modify and include the part of the software into any other
-   software (possibly commercial).  But some files in the distribution
-   are not written by the author, so that they are not under this terms.
-
-5. The scripts and library files supplied as input to or produced as 
-   output from the software do not automatically fall under the
-   copyright of the software, but belong to whomever generated them, 
-   and may be sold commercially, and may be aggregated with this
-   software.
-
-6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE.
-
-