puma 1.6.2-java → 1.6.3-java

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.6.3 / 2012-09-04
+
+* 1 bug fix:
+  * Close sockets waiting in the reactor when a hot restart is performed
+    so that browsers reconnect on the next request
+
 === 1.6.2 / 2012-08-27
 
 * 1 bug fix:

data/lib/puma/cli.rb

@@ -325,12 +325,13 @@ module Puma
 
           @listeners << [str, io]
         when "unix"
+          path = "#{uri.host}#{uri.path}"
+
           if fd = @inherited_fds.delete(str)
             log "* Inherited #{str}"
-            io = server.inherit_unix_listener uri.path, fd
+            io = server.inherit_unix_listener path, fd
           else
             log "* Listening on #{str}"
-            path = "#{uri.host}#{uri.path}"
 
             umask = nil
 

data/lib/puma/const.rb

@@ -25,7 +25,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.6.2".freeze
+    PUMA_VERSION = VERSION = "1.6.3".freeze
 
     # The default number of seconds for another request within a persistent
     # session.

data/lib/puma/events.rb

@@ -16,6 +16,9 @@ module Puma
     def initialize(stdout, stderr)
       @stdout = stdout
       @stderr = stderr
+
+      @stdout.sync = true
+      @stderr.sync = true
     end
 
     attr_reader :stdout, :stderr

data/lib/puma/reactor.rb

@@ -30,6 +30,15 @@ module Puma
                 when "*"
                   sockets += @input
                   @input.clear
+                when "c"
+                  sockets.delete_if do |s|
+                    if s == @ready
+                      false
+                    else
+                      s.close
+                      true
+                    end
+                  end
                 when "!"
                   return
                 end
@@ -121,8 +130,14 @@ module Puma
       end
     end
 
+    # Close all watched sockets and clear them from being watched
+    def clear!
+      @trigger << "c"
+    end
+
     def shutdown
       @trigger << "!"
+      @thread.join
     end
   end
 end

data/lib/puma/server.rb

@@ -261,6 +261,8 @@ module Puma
           end
         end
 
+        @reactor.clear! if @status == :restart
+
         @reactor.shutdown
         graceful_shutdown if @status == :stop
       ensure

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.6.2"
+  s.version = "1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-08-27"
+  s.date = "2012-09-04"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]

data/test/test_integration.rb

@@ -1,6 +1,8 @@
 require "rbconfig"
 require 'test/unit'
 require 'socket'
+require 'timeout'
+require 'net/http'
 
 require 'puma/cli'
 require 'puma/control_cli'
@@ -10,12 +12,34 @@ class TestIntegration < Test::Unit::TestCase
     @state_path = "test/test_puma.state"
     @bind_path = "test/test_server.sock"
     @control_path = "test/test_control.sock"
+    @tcp_port = 9998
+
+    @server = nil
   end
 
   def teardown
     File.unlink @state_path rescue nil
     File.unlink @bind_path  rescue nil
     File.unlink @control_path rescue nil
+
+    if @server
+      Process.kill "INT", @server.pid
+      Process.wait @server.pid
+      @server.close
+    end
+  end
+
+  def server(opts)
+    core = "#{Gem.ruby} -rubygems -Ilib bin/puma"
+    cmd = "#{core} --restart-cmd '#{core}' -b tcp://127.0.0.1:#{@tcp_port} #{opts}"
+    @server = IO.popen(cmd, "r")
+
+    sleep 1
+    @server
+  end
+
+  def signal(which)
+    Process.kill which, @server.pid
   end
 
   def test_stop_via_pumactl
@@ -45,4 +69,29 @@ class TestIntegration < Test::Unit::TestCase
 
     assert_kind_of Thread, t.join(1), "server didn't stop"
   end
+
+  def test_restart_closes_keepalive_sockets
+    server("-q test/hello.ru")
+
+    s = TCPSocket.new "localhost", @tcp_port
+    s << "GET / HTTP/1.1\r\n\r\n"
+    true until s.gets == "\r\n"
+
+    s.readpartial(20)
+    signal :USR2
+
+    sleep 3
+
+    s.write "GET / HTTP/1.1\r\n\r\n"
+
+    assert_raises Errno::ECONNRESET do
+      Timeout.timeout(2) do
+        s.read(2)
+      end
+    end
+
+    s = TCPSocket.new "localhost", @tcp_port
+    s << "GET / HTTP/1.0\r\n\r\n"
+    assert_equal "Hello World", s.read.split("\r\n").last
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.2
+  version: 1.6.3
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 Z
+date: 2012-09-04 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack