puma 2.6.0-java → 2.7.0-java

data/History.txt

@@ -1,3 +1,20 @@
+=== 2.7.0 / 2013-12-03
+
+* 1 minor feature:
+  * Adding TTIN and TTOU to increment/decrement workers
+
+* N bug fixes:
+  * Always use our Process.daemon because it's not busted
+  * Add capistrano restart failback to start.
+  * Change position of `cd` so that rvm gemset is loaded
+  * Clarify some platform specifics
+  * Do not close the pipe sockets when retrying
+  * Fix String#byteslice for Ruby 1.9.1, 1.9.2
+  * Fix compatibility with 1.8.7.
+  * Handle IOError closed stream in IO.select
+  * Increase the max URI path length to 2048 chars from 1024 chars
+  * Upstart jungle use config/puma.rb instead
+
 === 2.6.0 / 2013-09-13
 
 * 2 minor features:

data/README.md

@@ -22,7 +22,7 @@ The easiest way to get started with Puma is to install it via RubyGems. You can
 
     $ gem install puma
 
-Now you should have the puma command available in your PATH, so just do the following in the root folder of your Rack application:
+Now you should have the `puma` command available in your PATH, so just do the following in the root folder of your Rack application:
 
     $ puma app.ru
 
@@ -82,7 +82,7 @@ Puma 2 offers clustered mode, allowing you to use forked processes to handle mul
 On a ruby implementation that offers native threads, you should tune this number to match the number of cores available.
 Note that threads are still used in clustered mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will be 32 threads.
 
-If you're running in Clustered Mode you can optionally choose to preload your application before starting up the workers. To do this simply specify the `--preload` flag in invocation:
+If you're running in Clustered Mode you can optionally choose to preload your application before starting up the workers. This is necessary in order to take advantate of the [Copy on Write](http://en.wikipedia.org/wiki/Copy-on-write) feature introduced in [MRI Ruby 2.0](https://blog.heroku.com/archives/2013/3/6/matz_highlights_ruby_2_0_at_waza). To do this simply specify the `--preload` flag in invocation:
 
     # CLI invocation
     $ puma -t 8:32 -w 3 --preload
@@ -104,7 +104,7 @@ Additionally, you can specify a block in your configuration file that will be ru
     end
 
 This code can be used to setup the process before booting the application, allowing
-you to do some puma-specific things that you don't want to embed in your application.
+you to do some Puma-specific things that you don't want to embed in your application.
 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.
 
@@ -137,15 +137,15 @@ 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 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
 
-This directs puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out [status.rb](https://github.com/puma/puma/blob/master/lib/puma/app/status.rb) to see what the app has available.
+This directs Puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out [status.rb](https://github.com/puma/puma/blob/master/lib/puma/app/status.rb) to see what the app has available.
 
 ### Configuration file
 
-You can also provide a configuration file which puma will use with the `-C` (or `--config`) flag:
+You can also provide a configuration file which Puma will use with the `-C` (or `--config`) flag:
 
     $ puma -C /path/to/config
 
@@ -153,30 +153,30 @@ Take the following [sample configuration](https://github.com/puma/puma/blob/mast
 
 ## Restart
 
-Puma includes the ability to restart itself allowing easy upgrades to new versions. When available (MRI, Rubinius, JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
+Puma includes the ability to restart itself allowing easy upgrades to new versions. When available (MRI, Rubinius, JRuby), Puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
 
 To perform a restart, there are 2 builtin mechanisms:
 
-  * Send the puma process the `SIGUSR2` signal
+  * Send the `puma` process the `SIGUSR2` signal
   * Use the status server and issue `/restart`
 
-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.
+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 supervisor when using it in production.
 
 ### 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.
+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.
 
 ### 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 implement certain things, the following differences occur when Puma is used on different platforms:
 
-  * On JRuby and 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.
-  * On Windows, daemon mode is not supported due to a lack of fork(2).
-  * On JRuby and Windows, cluster mode is not supported due to a lack of fork(2).
+  * **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)
+  * **Windows**: daemon mode is not supported due to a lack of fork(2)
 
 ## pumactl
 

data/ext/puma_http11/org/jruby/puma/Http11.java

@@ -30,8 +30,8 @@ public class Http11 extends RubyObject {
     public final static String MAX_REQUEST_URI_LENGTH_ERR = "HTTP element REQUEST_URI is longer than the 12288 allowed length.";
     public final static int MAX_FRAGMENT_LENGTH = 1024;
     public final static String MAX_FRAGMENT_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
-    public final static int MAX_REQUEST_PATH_LENGTH = 1024;
-    public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
+    public final static int MAX_REQUEST_PATH_LENGTH = 2048;
+    public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 2048 allowed length.";
     public final static int MAX_QUERY_STRING_LENGTH = 1024 * 10;
     public final static String MAX_QUERY_STRING_LENGTH_ERR = "HTTP element QUERY_STRING is longer than the 10240 allowed length.";
     public final static int MAX_HEADER_LENGTH = 1024 * (80 + 32);

data/ext/puma_http11/puma_http11.c

@@ -52,7 +52,7 @@ DEF_MAX_LENGTH(FIELD_NAME, 256);
 DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024);
 DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12);
 DEF_MAX_LENGTH(FRAGMENT, 1024); /* Don't know if this length is specified somewhere or not */
-DEF_MAX_LENGTH(REQUEST_PATH, 1024);
+DEF_MAX_LENGTH(REQUEST_PATH, 2048);
 DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10));
 DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32)));
 

data/lib/puma/capistrano.rb

@@ -28,7 +28,12 @@ Capistrano::Configuration.instance.load do
 
     desc 'Restart puma'
     task :restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} restart"
+      begin
+        run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} restart"
+      rescue Capistrano::CommandError => ex
+        puts "Failed to restart puma: #{ex}\nAssuming not started."
+        start
+      end
     end
 
     desc 'Restart puma (phased restart)'

data/lib/puma/cli.rb

@@ -283,7 +283,7 @@ module Puma
       @config.load
 
       if clustered?
-        unsupported "worker mode not supported on JRuby and Windows",
+        unsupported "worker mode not supported on JRuby or Windows",
                     jruby? || windows?
       end
 

data/lib/puma/cluster.rb

@@ -230,6 +230,17 @@ module Puma
         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

data/lib/puma/compat.rb

@@ -6,6 +6,13 @@ class String
   end
 
   unless method_defined? :byteslice
-    alias_method :byteslice, :[]
+    if RUBY_VERSION < '1.9'
+      alias_method :byteslice, :[]
+    else
+      def byteslice(*arg)
+        enc = self.encoding
+        self.dup.force_encoding(Encoding::ASCII_8BIT).slice(*arg).force_encoding(enc)
+      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.6.0".freeze
-    CODE_NAME = "Pantsuit Party"
+    PUMA_VERSION = VERSION = "2.7.0".freeze
+    CODE_NAME = "Earl of Sandwich Partition"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/daemon_ext.rb

@@ -1,4 +1,8 @@
 module Process
+
+  # This overrides the default version because it is broken if it
+  # exists.
+
   def self.daemon(nochdir=false, noclose=false)
     exit if fork                     # Parent exits, child continues.
 
@@ -16,5 +20,5 @@ module Process
     end
 
     0
-  end unless respond_to?(:daemon)
+  end
 end

data/lib/puma/minissl.rb

@@ -27,15 +27,23 @@ module Puma
         end
       end
 
+      def engine_read_all
+        output = @engine.read
+        while output and additional_output = @engine.read
+          output << additional_output
+        end
+        output
+      end
+
       def read_nonblock(size)
         while true
-          output = @engine.read
+          output = engine_read_all
           return output if output
 
           data = @socket.read_nonblock(size)
 
           @engine.inject(data)
-          output = @engine.read
+          output = engine_read_all
 
           return output if output
 

data/lib/puma/reactor.rb

@@ -18,11 +18,24 @@ module Puma
       @sockets = [@ready]
     end
 
-    def run
+    private
+
+    def run_internal
       sockets = @sockets
 
       while true
-        ready = IO.select sockets, nil, nil, @sleep_for
+        begin
+          ready = IO.select sockets, nil, nil, @sleep_for
+        rescue IOError => e
+          if sockets.any? { |socket| socket.closed? }
+            STDERR.puts "Error in select: #{e.message} (#{e.class})"
+            STDERR.puts e.backtrace
+            sockets = sockets.reject { |socket| socket.closed? }
+            retry
+          else
+            raise
+          end
+        end
 
         if ready and reads = ready[0]
           reads.each do |c|
@@ -95,23 +108,30 @@ module Puma
           end
         end
       end
+    end
+
+    public
+
+    def run
+      run_internal
     ensure
       @trigger.close
       @ready.close
     end
 
     def run_in_thread
-      @thread = Thread.new {
-        while true
-          begin
-            run
-            break
-          rescue StandardError => e
-            STDERR.puts "Error in reactor loop escaped: #{e.message} (#{e.class})"
-            puts e.backtrace
-          end
+      @thread = Thread.new do
+        begin
+          run_internal
+        rescue StandardError => e
+          STDERR.puts "Error in reactor loop escaped: #{e.message} (#{e.class})"
+          STDERR.puts e.backtrace
+          retry
+        ensure
+          @trigger.close
+          @ready.close
         end
-      }
+      end
     end
 
     def calculate_sleep

data/lib/puma/server.rb

@@ -17,7 +17,7 @@ require 'puma/rack_patch'
 
 require 'puma/puma_http11'
 
-unless Puma.const_defined? "IOBuffer"
+unless Puma.const_defined?("IOBuffer", false)
   require 'puma/io_buffer'
 end
 

data/test/test_http11.rb

@@ -21,7 +21,7 @@ class Http11ParserTest < Test::Unit::TestCase
     assert_equal '/', req['REQUEST_PATH']
     assert_equal 'HTTP/1.1', req['HTTP_VERSION']
     assert_equal '/', req['REQUEST_URI']
-    assert_equal 'GET', req['REQUEST_METHOD']    
+    assert_equal 'GET', req['REQUEST_METHOD']
     assert_nil req['FRAGMENT']
     assert_nil req['QUERY_STRING']
     
@@ -81,7 +81,26 @@ class Http11ParserTest < Test::Unit::TestCase
 
     return res
   end
-  
+
+  def test_max_uri_path_length
+    parser = HttpParser.new
+    req = {}
+
+    # Support URI path length to a max of 2048
+    path = "/" + rand_data(1000, 100)
+    http = "GET #{path} HTTP/1.1\r\n\r\n"
+    parser.execute(req, http, 0)
+    assert_equal path, req['REQUEST_PATH']
+    parser.reset
+
+    # Raise exception if URI path length > 2048
+    path = "/" + rand_data(2048, 100)
+    http = "GET #{path} HTTP/1.1\r\n\r\n"
+    assert_raises Puma::HttpParserError do
+      parser.execute(req, http, 0)
+      parser.reset
+    end
+  end
 
   def test_horrible_queries
     parser = HttpParser.new

data/tools/jungle/upstart/puma.conf

@@ -38,8 +38,6 @@ exec /bin/bash <<'EOT'
   # set HOME to the setuid user's home, there doesn't seem to be a better, portable way
   export HOME="$(eval echo ~$(id -un))"
 
-  cd $app
-
   if [ -d "$HOME/.rbenv/bin" ]; then
     export PATH="$HOME/.rbenv/bin:$PATH"
   elif [ -f  /etc/profile.d/rvm.sh ]; then
@@ -57,8 +55,9 @@ exec /bin/bash <<'EOT'
     # chruby 2.0.0
   fi
 
+  cd $app
   logger -t puma "Starting server: $app"
 
-  exec bundle exec puma -C config/puma/production.rb
+  exec bundle exec puma -C config/puma.rb
 EOT
-end script
+end script

metadata

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