puma 2.10.1-java → 2.10.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0c278f7afeeb8f9a63ee5e432dd35cda2b0ef1
-  data.tar.gz: baf0b1049422bc1201a62f5ebbb5d38cf0a49388
+  metadata.gz: 198c788fc20ee4db44015ece6777e118d1abc3b4
+  data.tar.gz: 3d63d1b999599a1615ee7a79f68900019b58e18d
 SHA512:
-  metadata.gz: 0d0144fdbb58e698cbd98c11c0d5845b066dec422d64438f4d8af541c72dba27783f3548dcd67569f207b0ae71207e5808a2c1bffc0db7aaeb296c42c7ae8553
-  data.tar.gz: bc386cd64fafc83f5e02d4a151a33d96c8c45ebfc43d2249b6c85b64f6d763e05bd8325cd8e0bcc25a23f0c7d81543dff1196a30d42ee190fce098bde176c89a
+  metadata.gz: 50d71dab52b51e56c433aed14973f339dd78b141f11a60d15de3870d6afbeb72f82ca706d5a3a5de915f011bced5667de8d1e96bef8da215f046c8b443861893
+  data.tar.gz: e6ff97f2decbbc55ad6fcb7313b108cd5b8f57abb0d01270c833ea4d89038bb9f20928b13cffd48f74aa8f8c4aa9c9052127d8043938d57c259623968c15f371

data/History.txt

@@ -1,4 +1,12 @@
-=== 2.10.1 / 2014-11-14
+=== 2.10.2 / 2014-11-26
+
+* 1 bug fix:
+  * Conditionalize thread local cleaning, fixes perf degradation fix
+    The code to clean out all Thread locals adds pretty significant
+    overhead to a each request, so it has to be turned on explicitly
+    if a user needs it.
+
+=== 2.10.1 / 2014-11-24
 
 * 1 bug fix:
   * Load the app after daemonizing because the app might start threads.

data/lib/puma/configuration.rb

@@ -212,6 +212,13 @@ module Puma
         @options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{port}"
       end
 
+      # Work around leaky apps that leave garbage in Thread locals
+      # across requests
+      #
+      def clean_thread_locals(which=true)
+        @options[:clean_thread_locals] = which
+      end
+
       # Daemonize the server into the background. Highly suggest that
       # this be combined with +pidfile+ and +stdout_redirect+.
       def daemonize(which=true)

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.10.1".freeze
+    PUMA_VERSION = VERSION = "2.10.2".freeze
     CODE_NAME = "Robots on Comets".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/server.rb

@@ -259,6 +259,8 @@ module Puma
         end
       end
 
+      @thread_pool.clean_thread_locals = @options[:clean_thread_locals]
+
       @reactor = Reactor.new self, @thread_pool
 
       @reactor.run_in_thread

data/lib/puma/thread_pool.rb

@@ -36,9 +36,12 @@ module Puma
       @mutex.synchronize do
         @min.times { spawn_thread }
       end
+
+      @clean_thread_locals = false
     end
 
     attr_reader :spawned, :trim_requested
+    attr_accessor :clean_thread_locals
 
     # How many objects have yet to be processed by the pool?
     #
@@ -89,8 +92,10 @@ module Puma
 
           break unless continue
 
-          Thread.current.keys.each do |key|
-            Thread.current[key] = nil unless key == :__recursive_key__
+          if @clean_thread_locals
+            Thread.current.keys.each do |key|
+              Thread.current[key] = nil unless key == :__recursive_key__
+            end
           end
 
           block.call(work, *extra)

data/test/test_thread_pool.rb

@@ -167,6 +167,8 @@ class TestThreadPool < Test::Unit::TestCase
       Thread.pass until finished
     }
 
+    pool.clean_thread_locals = true
+
     n.times { pool << 1 }
 
     finished = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement