puma 3.3.0-java → 3.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db88941163e2684d462f325b8925101502e52854
-  data.tar.gz: f7b1c9db56a8266f91be1a2663345f7a31290bac
+  metadata.gz: 7b9408ecc6b252ce70124427abdf94cf1cf5b96e
+  data.tar.gz: afb3ec1033c96e1e322a972c2df8a0e64cab195c
 SHA512:
-  metadata.gz: e23f516cda511172581e743ac65ab8db24cbd89e43bf1e5d55218379ea0bc56265e4e363d217d80311c799d9b068e54189cecc37c423d80831cb25559c083e04
-  data.tar.gz: 7058a5382117a2f917219c3478a0fd0f4660c1f9eca12dc993f781d18b255952068c4d52f90d0eb42093b76bfedc26470a05d6dc7d9a97f64d95d2b787c05c93
+  metadata.gz: 33c729e66fd67e0c5c36d6d8740df454c59669c6d00f8b9ca7eda2992f87e1e484406c3529075589719dcc6529d789e3cda637e64fb564a9c43f0899d299fc9d
+  data.tar.gz: 779ca348bd5453b33701490f300bcd2f7de696b019be4f3e22cad480c6fcb80200e90adc946890876d81a54d85cd0cda7bfd255cf7c24472db09fcdd823cde06

data/History.txt

@@ -1,3 +1,26 @@
+=== 3.4.0 / 2016-04-07
+
+* 2 minor features:
+  * Add ability to force threads to stop on shutdown. Fixes #938
+  * Detect and commit seppuku when fork(2) fails. Fixes #529
+
+* 3 unknowns:
+  * Ignore errors trying to update the backport tables. Fixes #788
+  * Invoke the lowlevel_error in more places to allow for exception tracking. Fixes #894
+  * Update the query string when an absolute URI is used. Fixes #937
+
+* 5 doc fixes:
+  * Add Process Monitors section to top-level README
+  * Better document the hooks. Fixes #840
+  * docs/system.md sample config refinements and elaborations
+  * Fix typos at couple of places.
+  * Cleanup warnings
+
+* 3 PRs merged:
+  * Merge pull request #945 from dekellum/systemd-docs-refined
+  * Merge pull request #946 from vipulnsward/rm-pid
+  * Merge pull request #947 from vipulnsward/housekeeping-typos
+
 === 3.3.0 / 2016-04-05
 
 * 2 minor features:
@@ -980,7 +1003,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
 
 === 1.5.0 / 2012-07-19
 
-* 7 contributers to this release:
+* 7 contributors to this release:
   * Christian Mayer
   * Darío Javier Cravero
   * Dirkjan Bussink
@@ -1028,7 +1051,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
   * Only stop the status server if it's started. Fixes #84
   * Set RACK_ENV early in cli also. Fixes #78
 
-* 1 new contributer:
+* 1 new contributor:
   * Jesse Cooke
 
 === 1.2.2 / 2012-04-28
@@ -1064,9 +1087,9 @@ be added back in a future date when a java Puma::MiniSSL is added.
     * Fix reporting https only on a true SSL connection
     * Set the default content type to 'text/plain'. Fixes #63
     * Use REUSEADDR. Fixes #60
-    * Shutdown gracefull on SIGTERM. Fixes #53
+    * Shutdown gracefully on SIGTERM. Fixes #53
 
- 2 new contributers:
+ 2 new contributors:
 
    * Seamus Abshere
    * Steve Richert

data/README.md

@@ -238,7 +238,7 @@ To perform a restart, there are 2 builtin mechanisms:
 
 No code is shared between the current and restarted process, so it should be safe to issue a restart any place where you would manually stop Puma and start it again.
 
-If the new process is unable to load, it will simply exit. You should therefore run Puma under a supervisor when using it in production.
+If the new process is unable to load, it will simply exit. You should therefore run Puma under a process monitor (see below) when using it in production.
 
 ### Normal vs Hot vs Phased Restart
 
@@ -295,9 +295,15 @@ Because of various platforms not being able to implement certain things, the fol
 
 `pumactl` is a simple CLI frontend to the control/status app described above.  Please refer to `pumactl --help` for available commands.
 
-## Managing multiple Pumas / init.d / upstart scripts
+## Process Monitors
 
-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.
+Process monitors or supervisors will at minimum provide start of Puma
+on system boot. Modern process monitors like systemd or upstart
+further provide continuous monitoring and restarts for increased
+reliability in production environments:
+
+* [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for sysvinit (init.d) and upstart
+* [docs/systemd](https://github.com/puma/puma/blob/master/docs/systemd.md)
 
 ## Capistrano deployment
 

data/docs/nginx.md

@@ -34,7 +34,7 @@ server {
     proxy_set_header Host $http_host;
 
     # If the file exists as a static file serve it directly without
-    # running all the other rewite tests on it
+    # running all the other rewrite tests on it
     if (-f $request_filename) {
       break;
     }
@@ -50,7 +50,7 @@ server {
     # this is the meat of the rack page caching config
     # it adds .html to the end of the url and then checks
     # the filesystem for that file. If it exists, then we
-    # rewite the url to have explicit .html on the end
+    # rewrite the url to have explicit .html on the end
     # and then send it on its way to the next config rule.
     # if there is no file on the fs then it sets all the
     # necessary headers and proxies to our upstream pumas

data/docs/systemd.md

@@ -11,6 +11,9 @@ puma.service configuration file for systemd:
 Description=Puma HTTP Server
 After=network.target
 
+# Uncomment for socket activation (see below)
+# Requires=puma.socket
+
 [Service]
 # Foreground process (do not use --daemon in ExecStart or config.rb)
 Type=simple
@@ -33,7 +36,7 @@ Type=simple
 
 # Alternatively with a config file (in WorkingDirectory) and
 # comparable `bind` directives
-# ExecStart=<WorkingDirectory>/sbin/puma -C config.rb
+# ExecStart=<WD>/sbin/puma -C config.rb
 
 Restart=always
 
@@ -66,13 +69,102 @@ ListenStream=0.0.0.0:9293
 # SocketUser, SocketGroup, etc. may be needed for Unix domain sockets
 # ListenStream=/run/puma.sock
 
-# Socket options matching what Puma wants
+# Socket options matching Puma defaults
 NoDelay=true
 ReusePort=true
+Backlog=1024
 
 [Install]
 WantedBy=sockets.target
 ~~~~
 
 See [systemd.socket](https://www.freedesktop.org/software/systemd/man/systemd.socket.html)
-for additional details.
+for additional configuration details.
+
+Note that the above configurations will work with Puma in either
+single process or cluster mode.
+
+## Usage
+
+Without socket activation, use `systemctl` as root (e.g. via `sudo`) as
+with other system services:
+
+~~~~ sh
+# After installing or making changes to puma.service
+systemctl daemon-reload
+
+# Enable so it starts on boot
+systemctl enable puma.service
+
+# Initial start up.
+systemctl start puma.service
+
+# Check status
+systemctl status puma.service
+
+# A normal restart. Warning: listeners sockets will be closed
+# while a new puma process initializes.
+systemctl restart puma.service
+~~~~
+
+With socket activation, several but not all of these commands should
+be run for both socket and service:
+
+~~~~ sh
+# After installing or making changes to either puma.socket or
+# puma.service.
+systemctl daemon-reload
+
+# Enable both socket and service so they start on boot.  Alternatively
+# you could leave puma.service disabled and systemd will start it on
+# first use (with startup lag on first request)
+systemctl enable puma.socket puma.service
+
+# Initial start up. The Requires directive (see above) ensures the
+# socket is started before the service.
+systemctl start puma.socket puma.service
+
+# Check status of both socket and service.
+systemctl status puma.socket puma.service
+
+# A "hot" restart, with systemd keeping puma.socket listening and
+# providing to the new puma (master) instance.
+systemctl restart puma.service
+
+# A normal restart, needed to handle changes to
+# puma.socket, such as changing the ListenStream ports. Note
+# daemon-reload (above) should be run first.
+systemctl restart puma.socket puma.service
+~~~~
+
+Here is sample output from `systemctl status` with both service and
+socket running:
+
+~~~~
+● puma.socket - Puma HTTP Server Accept Sockets
+   Loaded: loaded (/etc/systemd/system/puma.socket; enabled; vendor preset: enabled)
+   Active: active (running) since Thu 2016-04-07 08:40:19 PDT; 1h 2min ago
+   Listen: 0.0.0.0:9233 (Stream)
+           0.0.0.0:9234 (Stream)
+
+Apr 07 08:40:19 hx systemd[874]: Listening on Puma HTTP Server Accept Sockets.
+
+● puma.service - Puma HTTP Server
+   Loaded: loaded (/etc/systemd/system/puma.service; enabled; vendor preset: enabled)
+   Active: active (running) since Thu 2016-04-07 08:40:19 PDT; 1h 2min ago
+ Main PID: 28320 (ruby)
+   CGroup: /system.slice/puma.service
+           ├─28320 puma 3.3.0 (tcp://0.0.0.0:9233,ssl://0.0.0.0:9234?key=key.pem&cert=cert.pem) [app]
+           ├─28323 puma: cluster worker 0: 28320 [app]
+           └─28327 puma: cluster worker 1: 28320 [app]
+
+Apr 07 08:40:19 hx puma[28320]: Puma starting in cluster mode...
+Apr 07 08:40:19 hx puma[28320]: * Version 3.3.0 (ruby 2.2.4-p230), codename: Jovial Platypus
+Apr 07 08:40:19 hx puma[28320]: * Min threads: 0, max threads: 16
+Apr 07 08:40:19 hx puma[28320]: * Environment: production
+Apr 07 08:40:19 hx puma[28320]: * Process workers: 2
+Apr 07 08:40:19 hx puma[28320]: * Phased restart available
+Apr 07 08:40:19 hx puma[28320]: * Activated tcp://0.0.0.0:9233
+Apr 07 08:40:19 hx puma[28320]: * Activated ssl://0.0.0.0:9234?key=key.pem&cert=cert.pem
+Apr 07 08:40:19 hx puma[28320]: Use Ctrl-C to stop
+~~~~

data/lib/puma/binder.rb

@@ -23,7 +23,7 @@ module Puma
         "SCRIPT_NAME".freeze => ENV['SCRIPT_NAME'] || "",
 
         # I'd like to set a default CONTENT_TYPE here but some things
-        # depend on their not being a default set and infering
+        # depend on their not being a default set and inferring
         # it from the content. And so if i set it here, it won't
         # infer properly.
 
@@ -230,7 +230,7 @@ module Puma
         end
       end
 
-      # Also close any unsued activated sockets
+      # Also close any unused activated sockets
       @activated_sockets.each do |key, sock|
         logger.log "* Closing unused activated socket: #{key.join ':'}"
         begin

data/lib/puma/cluster.rb

@@ -118,6 +118,12 @@ module Puma
         @launcher.config.run_hooks :before_worker_fork, idx
 
         pid = fork { worker(idx, master) }
+        if !pid
+          log "! Complete inability to spawn new workers detected"
+          log "! Seppuku is the only choice."
+          exit! 1
+        end
+
         debug "Spawned worker: #{pid}"
         @workers << Worker.new(idx, pid, @phase, @options)
 

data/lib/puma/const.rb

@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.3.0".freeze
-    CODE_NAME = "Jovial Platypus".freeze
+    PUMA_VERSION = VERSION = "3.4.0".freeze
+    CODE_NAME = "Owl Bowl Brawl".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
     
     FAST_TRACK_KA_TIMEOUT = 0.2
@@ -118,6 +118,11 @@ module Puma
     # sending data back
     WRITE_TIMEOUT = 10
 
+    # How long, after raising the ForceShutdown of a thread during
+    # forced shutdown mode, to wait for the thread to try and finish
+    # up it's work before leaving the thread to die on the vine.
+    SHUTDOWN_GRACE_TIME = 5 # seconds
+
     DATE = "Date".freeze
 
     SCRIPT_NAME = "SCRIPT_NAME".freeze
@@ -125,6 +130,7 @@ module Puma
     # The original URI requested by the client.
     REQUEST_URI= 'REQUEST_URI'.freeze
     REQUEST_PATH = 'REQUEST_PATH'.freeze
+    QUERY_STRING = 'QUERY_STRING'.freeze
 
     PATH_INFO = 'PATH_INFO'.freeze
 

data/lib/puma/dsl.rb

@@ -159,6 +159,26 @@ module Puma
       @options[:environment] = environment
     end
 
+    # How long to wait for threads to stop when shutting them
+    # down. Defaults to :forever. Specifying :immediately will cause
+    # Puma to kill the threads immediately.  Otherwise the value
+    # is the number of seconds to wait.
+    #
+    # Puma always waits a few seconds after killing a thread for it to try
+    # to finish up it's work, even in :immediately mode.
+    def force_shutdown_after(val=:forever)
+      i = case val
+          when :forever
+            -1
+          when :immediately
+            0
+          else
+            Integer(val)
+          end
+
+      @options[:force_shutdown_after] = i
+    end
+
     # Code to run before doing a restart. This code should
     # close logfiles, database connections, etc.
     #
@@ -271,6 +291,15 @@ module Puma
       _ary(:before_fork) << block
     end
 
+    # *Cluster mode only* Code to run in a worker when it boots to setup
+    # the process before booting the app.
+    #
+    # This can be called multiple times to add hooks.
+    #
+    def on_worker_boot(&block)
+      _ary(:before_worker_boot) << block
+    end
+
     # *Cluster mode only* Code to run immediately before a worker shuts
     # down (after it has finished processing HTTP requests). These hooks
     # can block if necessary to wait for background operations unknown
@@ -282,16 +311,7 @@ module Puma
       _ary(:before_worker_shutdown) << block
     end
 
-    # *Cluster mode only* Code to run when a worker boots to setup
-    # the process before booting the app.
-    #
-    # This can be called multiple times to add hooks.
-    #
-    def on_worker_boot(&block)
-      _ary(:before_worker_boot) << block
-    end
-
-    # *Cluster mode only* Code to run when a master process is
+    # *Cluster mode only* Code to run in the master when it is
     # about to create the worker by forking itself.
     #
     # This can be called multiple times to add hooks.
@@ -300,15 +320,17 @@ module Puma
       _ary(:before_worker_fork) << block
     end
 
-    # *Cluster mode only* Code to run when a worker boots to setup
-    # the process after booting the app.
+    # *Cluster mode only* Code to run in the master after it starts
+    # a worker.
     #
     # This can be called multiple times to add hooks.
     #
-    def after_worker_boot(&block)
+    def after_worker_fork(&block)
       _ary(:after_worker_fork) << block
     end
 
+    alias_method :after_worker_boot, :after_worker_fork
+
     # The directory to operate out of.
     def directory(dir)
       @options[:directory] = dir.to_s

data/lib/puma/launcher.rb

@@ -12,7 +12,7 @@ require 'puma/state_file'
 require 'puma/commonlogger'
 
 module Puma
-  # Puam::Launcher is the single entry point for starting a Puma server based on user
+  # Puma::Launcher is the single entry point for starting a Puma server based on user
   # configuration. It is responsible for taking user supplied arguments and resolving them
   # with configuration in `config/puma.rb` or `config/puma/<env>.rb`.
   #

data/lib/puma/rack/backports/uri/common_18.rb

@@ -7,22 +7,25 @@
 #
 
 module URI
-  TBLENCWWWCOMP_ = {} # :nodoc:
-  256.times do |i|
-    TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
-  end
-  TBLENCWWWCOMP_[' '] = '+'
-  TBLENCWWWCOMP_.freeze
-  TBLDECWWWCOMP_ = {} # :nodoc:
-  256.times do |i|
-    h, l = i>>4, i&15
-    TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+  begin
+    TBLENCWWWCOMP_ = {} # :nodoc:
+    256.times do |i|
+      TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
+    end
+    TBLENCWWWCOMP_[' '] = '+'
+    TBLENCWWWCOMP_.freeze
+    TBLDECWWWCOMP_ = {} # :nodoc:
+    256.times do |i|
+      h, l = i>>4, i&15
+      TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+    end
+    TBLDECWWWCOMP_['+'] = ' '
+    TBLDECWWWCOMP_.freeze
+  rescue Exception
   end
-  TBLDECWWWCOMP_['+'] = ' '
-  TBLDECWWWCOMP_.freeze
 
   # Encode given +s+ to URL-encoded form data.
   #

data/lib/puma/rack/backports/uri/common_192.rb

@@ -17,17 +17,20 @@
 require 'uri/common'
 
 module URI
-  TBLDECWWWCOMP_ = {} unless const_defined?(:TBLDECWWWCOMP_)  #:nodoc:
-  if TBLDECWWWCOMP_.empty?
-    256.times do |i|
-      h, l = i>>4, i&15
-      TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+  begin
+    TBLDECWWWCOMP_ = {} unless const_defined?(:TBLDECWWWCOMP_)  #:nodoc:
+    if TBLDECWWWCOMP_.empty?
+      256.times do |i|
+        h, l = i>>4, i&15
+        TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+        TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+        TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+        TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+      end
+      TBLDECWWWCOMP_['+'] = ' '
+      TBLDECWWWCOMP_.freeze
     end
-    TBLDECWWWCOMP_['+'] = ' '
-    TBLDECWWWCOMP_.freeze
+  rescue Exception
   end
 
   def self.decode_www_form(str, enc=Encoding::UTF_8)

data/lib/puma/rack/backports/uri/common_193.rb

@@ -8,22 +8,26 @@ require 'uri/common'
 # Relevant commit:
 # https://github.com/ruby/ruby/commit/edb7cdf1eabaff78dfa5ffedfbc2e91b29fa9ca1
 
+
 module URI
-  256.times do |i|
-    TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
-  end
-  TBLENCWWWCOMP_[' '] = '+'
-  TBLENCWWWCOMP_.freeze
+  begin
+    256.times do |i|
+      TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
+    end
+    TBLENCWWWCOMP_[' '] = '+'
+    TBLENCWWWCOMP_.freeze
 
-  256.times do |i|
-    h, l = i>>4, i&15
-    TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-    TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+    256.times do |i|
+      h, l = i>>4, i&15
+      TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+      TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+    end
+    TBLDECWWWCOMP_['+'] = ' '
+    TBLDECWWWCOMP_.freeze
+  rescue Exception
   end
-  TBLDECWWWCOMP_['+'] = ' '
-  TBLDECWWWCOMP_.freeze
 end
 
 # :startdoc:

data/lib/puma/reactor.rb

@@ -77,6 +77,8 @@ module Puma
 
               # SSL handshake failure
               rescue MiniSSL::SSLError => e
+                @server.lowlevel_error(e, c.env)
+
                 ssl_socket = c.io
                 addr = ssl_socket.peeraddr.last
                 cert = ssl_socket.peercert
@@ -88,6 +90,8 @@ module Puma
 
               # The client doesn't know HTTP well
               rescue HttpParserError => e
+                @server.lowlevel_error(e, c.env)
+
                 c.write_400
                 c.close
 
@@ -95,6 +99,8 @@ module Puma
 
                 @events.parse_error @server, c.env, e
               rescue StandardError => e
+                @server.lowlevel_error(e, c.env)
+
                 c.write_500
                 c.close
 

data/lib/puma/server.rb

@@ -430,6 +430,8 @@ module Puma
 
       # SSL handshake error
       rescue MiniSSL::SSLError => e
+        lowlevel_error(e, client.env)
+
         ssl_socket = client.io
         addr = ssl_socket.peeraddr.last
         cert = ssl_socket.peercert
@@ -440,12 +442,16 @@ module Puma
 
       # The client doesn't know HTTP well
       rescue HttpParserError => e
+        lowlevel_error(e, client.env)
+
         client.write_400
 
         @events.parse_error self, client.env, e
 
       # Server error
       rescue StandardError => e
+        lowlevel_error(e, client.env)
+
         client.write_500
 
         @events.unknown_error self, e, "Read"
@@ -486,6 +492,8 @@ module Puma
         env[REQUEST_PATH] = uri.path
 
         raise "No REQUEST PATH" unless env[REQUEST_PATH]
+
+        env[QUERY_STRING] = uri.query
       end
 
       env[PATH_INFO] = env[REQUEST_PATH]
@@ -571,6 +579,14 @@ module Puma
 
             return :async
           end
+        rescue ThreadPool::ForceShutdown => e
+          @events.log "Detected force shutdown of a thread, returning 503"
+          @events.unknown_error self, e, "Rack app"
+
+          status = 503
+          headers = {}
+          res_body = ["Request was internally terminated early\n"]
+
         rescue StandardError => e
           @events.unknown_error self, e, "Rack app"
 
@@ -723,7 +739,7 @@ module Puma
     end
     private :fetch_status_code
 
-    # Given the requset +env+ from +client+ and the partial body +body+
+    # Given the request +env+ from +client+ and the partial body +body+
     # plus a potential Content-Length value +cl+, finish reading
     # the body and return it.
     #
@@ -835,7 +851,13 @@ module Puma
         @events.debug "Drained #{count} additional connections."
       end
 
-      @thread_pool.shutdown if @thread_pool
+      if @thread_pool
+        if timeout = @options[:force_shutdown_after]
+          @thread_pool.shutdown timeout.to_i
+        else
+          @thread_pool.shutdown
+        end
+      end
     end
 
     # Stops the acceptor thread and then causes the worker threads to finish

data/lib/puma/single.rb

@@ -71,7 +71,7 @@ module Puma
             exit 1
           end
 
-          pid = jruby_daemon_start
+          jruby_daemon_start
           sleep
         end
       else

data/lib/puma/thread_pool.rb

@@ -5,6 +5,9 @@ module Puma
   #
   class ThreadPool
 
+    class ForceShutdown < RuntimeError
+    end
+
     # Maintain a minimum of +min+ and maximum of +max+ threads
     # in the pool.
     #
@@ -239,7 +242,7 @@ module Puma
 
     # Tell all threads in the pool to exit and wait for them to finish.
     #
-    def shutdown
+    def shutdown(timeout=-1)
       threads = @mutex.synchronize do
         @shutdown = true
         @not_empty.broadcast
@@ -251,7 +254,38 @@ module Puma
         @workers.dup
       end
 
-      threads.each(&:join)
+      case timeout
+      when -1
+        threads.each(&:join)
+      when 0
+        threads.each do |t|
+          t.raise ForceShutdown
+        end
+
+        threads.each do |t|
+          t.join Const::SHUTDOWN_GRACE_TIME
+        end
+      else
+        timeout.times do
+          threads.delete_if do |t|
+            t.join 1
+          end
+
+          if threads.empty?
+            break
+          else
+            sleep 1
+          end
+        end
+
+        threads.each do |t|
+          t.raise ForceShutdown
+        end
+
+        threads.each do |t|
+          t.join Const::SHUTDOWN_GRACE_TIME
+        end
+      end
 
       @spawned = 0
       @workers = []

data/tools/jungle/init.d/puma

@@ -357,7 +357,7 @@ case "$1" in
   ;;
   add)
     if [ "$#" -lt 3 ]; then
-      echo "Please, specifiy the app's directory and the user that will run it at least."
+      echo "Please, specify the app's directory and the user that will run it at least."
       echo "  Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
       echo "    config and log are optionals."
       exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement