puma 2.5.1-java → 2.6.0-java

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.6.0 / 2013-09-13
+
+* 2 minor features:
+  * Add support for event hooks
+  ** Add a hook for state transitions
+  * Add phased restart to capistrano recipe.
+
+* 4 bug fixes:
+  * Convince workers to stop by SIGKILL after timeout
+  * Define RSTRING_NOT_MODIFIED for Rubinius performance
+  * Handle BrokenPipe, StandardError and IOError in fat_wrote and break out
+  * Return success status to the invoking environment
+
 === 2.5.1 / 2013-08-13
 
 * 2 bug fixes:

data/README.md

@@ -202,6 +202,7 @@ and then
 $ bundle exec cap puma:start
 $ bundle exec cap puma:restart
 $ bundle exec cap puma:stop
+$ bundle exec cap puma:phased_restart
 ```
 
 

data/ext/puma_http11/http11_parser.h

@@ -6,6 +6,7 @@
 #ifndef http11_parser_h
 #define http11_parser_h
 
+#define RSTRING_NOT_MODIFIED 1
 #include "ruby.h"
 
 #include <sys/types.h>

data/ext/puma_http11/io_buffer.c

@@ -1,3 +1,4 @@
+#define RSTRING_NOT_MODIFIED 1
 #include "ruby.h"
 
 #include <sys/types.h>

data/ext/puma_http11/mini_ssl.c

@@ -1,3 +1,4 @@
+#define RSTRING_NOT_MODIFIED 1
 #include <ruby.h>
 #include <rubyio.h>
 #include <openssl/bio.h>

data/lib/puma/capistrano.rb

@@ -8,34 +8,41 @@ Capistrano::Configuration.instance.load do
   # v2 but is fixed in v3.
   shared_children.push('tmp/sockets')
 
-  _cset(:puma_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
+  _cset(:puma_cmd)    { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
   _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
-  _cset(:puma_state) { "#{shared_path}/sockets/puma.state" }
+  _cset(:puma_env)    { fetch(:rack_env, fetch(:rails_env, 'production')) }
+  _cset(:puma_state)  { "#{shared_path}/sockets/puma.state" }
   _cset(:puma_socket) { "unix://#{shared_path}/sockets/puma.sock" }
-  _cset(:puma_role) { :app }
+  _cset(:puma_role)   { :app }
 
   namespace :puma do
     desc 'Start puma'
-    task :start, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:puma_cmd)} #{start_options}", :pty => false
+    task :start, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
+      run "cd #{current_path} && #{puma_cmd} #{start_options}", :pty => false
     end
 
     desc 'Stop puma'
-    task :stop, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{state_path} stop"
+    task :stop, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
+      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} stop"
     end
 
     desc 'Restart puma'
-    task :restart, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{state_path} restart"
+    task :restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
+      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} restart"
     end
+
+    desc 'Restart puma (phased restart)'
+    task :phased_restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
+      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} phased-restart"
+    end
+
   end
 
   def start_options
     if config_file
       "-q -d -e #{puma_env} -C #{config_file}"
     else
-      "-q -d -e #{puma_env} -b '#{fetch(:puma_socket)}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
+      "-q -d -e #{puma_env} -b '#{puma_socket}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
     end
   end
 
@@ -52,7 +59,7 @@ Capistrano::Configuration.instance.load do
   end
 
   def state_path
-    (config_file ? configuration.options[:state] : nil) || fetch(:puma_state)
+    (config_file ? configuration.options[:state] : nil) || puma_state
   end
 
   def configuration

data/lib/puma/cluster.rb

@@ -33,9 +33,10 @@ module Puma
         @pid = pid
         @phase = phase
         @stage = :started
+        @signal = "TERM"
       end
 
-      attr_reader :pid, :phase
+      attr_reader :pid, :phase, :signal
 
       def booted?
         @stage == :booted
@@ -47,7 +48,13 @@ module Puma
 
       def term
         begin
-          Process.kill "TERM", @pid
+          if @first_term_sent && (Time.new - @first_term_sent) > 30
+            @signal = "KILL"
+          else
+            @first_term_sent ||= Time.new
+          end
+
+          Process.kill @signal, @pid
         rescue Errno::ESRCH
         end
       end
@@ -85,7 +92,7 @@ module Puma
 
       spawn_workers
 
-      if @phased_state == :idle && all_workers_booted?
+      if all_workers_booted?
         # If we're running at proper capacity, check to see if
         # we need to phase any workers out (which will restart
         # in the right phase).
@@ -93,9 +100,13 @@ module Puma
         w = @workers.find { |x| x.phase != @phase }
 
         if w
-          @phased_state = :waiting
-          log "- Stopping #{w.pid} for phased upgrade..."
+          if @phased_state == :idle
+            @phased_state = :waiting
+            log "- Stopping #{w.pid} for phased upgrade..."
+          end
+
           w.term
+          log "- #{w.signal} sent to #{w.pid}..."
         end
       end
     end

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.5.1".freeze
-    CODE_NAME = "Astronaut Shoelaces"
+    PUMA_VERSION = VERSION = "2.6.0".freeze
+    CODE_NAME = "Pantsuit Party"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/events.rb

@@ -23,10 +23,32 @@ module Puma
       @debug = ENV.key? 'PUMA_DEBUG'
 
       @on_booted = []
+
+      @hooks = Hash.new { |h,k| h[k] = [] }
     end
 
     attr_reader :stdout, :stderr
 
+    # Fire callbacks for the named hook
+    #
+    def fire(hook, *args)
+      @hooks[hook].each { |t| t.call(*args) }
+    end
+
+    # Register a callbock for a given hook
+    #
+    def register(hook, obj=nil, &blk)
+      if obj and blk
+        raise "Specify either an object or a block, not both"
+      end
+
+      h = obj || blk
+
+      @hooks[hook] << h
+
+      h
+    end
+
     # Write +str+ to +@stdout+
     #
     def log(str)

data/lib/puma/server.rb

@@ -156,6 +156,8 @@ module Puma
         client.close unless env['detach']
       end
 
+      @events.fire :state, :running
+
       if background
         @thread = Thread.new { handle_servers_lopez_mode }
         return @thread
@@ -194,6 +196,8 @@ module Puma
           end
         end
 
+        @events.fire :state, @status
+
         graceful_shutdown if @status == :stop || @status == :restart
 
       rescue Exception => e
@@ -207,6 +211,8 @@ module Puma
           @binder.close
         end
       end
+
+      @events.fire :state, :done
     end
     # Runs the server.
     #
@@ -217,6 +223,8 @@ module Puma
     def run(background=true)
       BasicSocket.do_not_reverse_lookup = true
 
+      @events.fire :state, :booting
+
       @status = :run
 
       if @mode == :tcp
@@ -255,6 +263,8 @@ module Puma
         @thread_pool.auto_trim!(@auto_trim_time)
       end
 
+      @events.fire :state, :running
+
       if background
         @thread = Thread.new { handle_servers }
         return @thread
@@ -293,6 +303,8 @@ module Puma
           end
         end
 
+        @events.fire :state, @status
+
         graceful_shutdown if @status == :stop || @status == :restart
         @reactor.clear! if @status == :restart
 
@@ -308,6 +320,8 @@ module Puma
           @binder.close
         end
       end
+
+      @events.fire :state, :done
     end
 
     # :nodoc:
@@ -763,6 +777,8 @@ module Puma
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
           IO.select(nil, [io], nil, 1)
           retry
+        rescue  Errno::EPIPE, SystemCallError, IOError
+          return false
         end
 
         return if n == str.bytesize

data/lib/puma/single.rb

@@ -58,7 +58,7 @@ module Puma
             # Must use exit! so we don't unwind and run the ensures
             # that will be run by the new child (such as deleting the
             # pidfile)
-            exit!
+            exit!(true)
           end
 
           Signal.trap "SIGCHLD" do

data/test/test_puma_server.rb

@@ -266,4 +266,27 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal "HTTP/1.0 200 OK\r\nContent-Type: application/pdf\r\nContent-Length: 4242\r\n\r\n", data
   end
+
+  def test_status_hook_fires_when_server_changes_states
+
+    states = []
+
+    @events.register(:state) { |s| states << s }
+
+    @server.app = proc { |env| [200, {}, [""]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "HEAD / HTTP/1.0\r\n\r\n"
+
+    sock.read
+
+    assert_equal [:booting, :running], states
+
+    @server.stop(true)
+
+    assert_equal [:booting, :running, :stop, :done], states
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: puma
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.5.1
+  version: 2.6.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack