puma 2.11.3-java → 2.12.0-java

data/test/test_rack_server.rb

@@ -2,8 +2,7 @@ require 'test/unit'
 require 'puma'
 require 'rack/lint'
 require 'test/testhelp'
-require 'rack/commonlogger'
-require 'puma/rack_patch'
+require 'puma/commonlogger'
 
 class TestRackServer < Test::Unit::TestCase
 

data/test/test_thread_pool.rb

@@ -179,4 +179,51 @@ class TestThreadPool < Test::Unit::TestCase
 
     assert_equal [], values.compact
   end
+
+  def test_reap_only_dead_threads
+    pool = new_pool(2,2) { Thread.current.kill }
+
+    assert_equal 2, pool.spawned
+
+    pool << 1
+
+    pause
+
+    assert_equal 2, pool.spawned
+
+    pool.reap
+
+    assert_equal 1, pool.spawned
+
+    pool << 2
+
+    pause
+
+    assert_equal 1, pool.spawned
+
+    pool.reap
+
+    assert_equal 0, pool.spawned
+  end
+
+  def test_auto_reap_dead_threads
+    pool = new_pool(2,2) { Thread.current.kill }
+
+    assert_equal 2, pool.spawned
+
+    pool << 1
+    pool << 2
+
+    pause
+
+    assert_equal 2, pool.spawned
+
+    pool.auto_reap! 1
+
+    sleep 1
+
+    pause
+
+    assert_equal 0, pool.spawned
+  end
 end

data/tools/jungle/upstart/puma.conf

@@ -34,11 +34,17 @@ script
 # respawn as bash so we can source in rbenv/rvm
 # quoted heredoc to tell /bin/sh not to interpret
 # variables
+
+# source ENV variables manually as Upstart doesn't, eg:
+#. /etc/environment
+
 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))"
 
-  if [ -d "$HOME/.rbenv/bin" ]; then
+  if [ -d "/usr/local/rbenv/bin" ]; then
+    export PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
+  elif [ -d "$HOME/.rbenv/bin" ]; then
     export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
   elif [ -f  /etc/profile.d/rvm.sh ]; then
     source /etc/profile.d/rvm.sh

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.12.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  name: rdoc
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -21,7 +35,7 @@ dependencies:
         version: '2.0'
   name: rack
   prerelease: false
-  type: :runtime
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -30,20 +44,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  name: rdoc
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -127,6 +127,7 @@ files:
 - lib/puma/cli.rb
 - lib/puma/client.rb
 - lib/puma/cluster.rb
+- lib/puma/commonlogger.rb
 - lib/puma/compat.rb
 - lib/puma/configuration.rb
 - lib/puma/const.rb
@@ -141,8 +142,11 @@ files:
 - lib/puma/jruby_restart.rb
 - lib/puma/minissl.rb
 - lib/puma/null_io.rb
+- lib/puma/rack/backports/uri/common_18.rb
+- lib/puma/rack/backports/uri/common_192.rb
+- lib/puma/rack/backports/uri/common_193.rb
+- lib/puma/rack/builder.rb
 - lib/puma/rack_default.rb
-- lib/puma/rack_patch.rb
 - lib/puma/reactor.rb
 - lib/puma/runner.rb
 - lib/puma/server.rb

data/lib/puma/rack_patch.rb

@@ -1,45 +0,0 @@
-require 'rack/commonlogger'
-
-module Rack
-  # Patch CommonLogger to use after_reply.
-  #
-  # Simply request this file and CommonLogger will be a bit more 
-  # efficient.
-  class CommonLogger
-    remove_method :call
-
-    def call(env)
-      began_at = Time.now
-      status, header, body = @app.call(env)
-      header = Utils::HeaderHash.new(header)
-
-      # If we've been hijacked, then output a special line
-      if env['rack.hijack_io']
-        log_hijacking(env, 'HIJACK', header, began_at)
-      elsif ary = env['rack.after_reply']
-        ary << lambda { log(env, status, header, began_at) }
-      else
-        body = BodyProxy.new(body) { log(env, status, header, began_at) }
-      end
-
-      [status, header, body]
-    end
-
-    HIJACK_FORMAT = %{%s - %s [%s] "%s %s%s %s" HIJACKED -1 %0.4f\n}
-
-    def log_hijacking(env, status, header, began_at)
-      now = Time.now
-
-      logger = @logger || env['rack.errors']
-      logger.write HIJACK_FORMAT % [
-        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
-        env["REMOTE_USER"] || "-",
-        now.strftime("%d/%b/%Y %H:%M:%S"),
-        env["REQUEST_METHOD"],
-        env["PATH_INFO"],
-        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
-        env["HTTP_VERSION"],
-        now - began_at ]
-    end
-  end
-end