puma 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb894db7abeda0bc6e6f3a8f986e3c738c16122
-  data.tar.gz: 19d26c21f925e0d6dddd3470010a5c4973e95499
+  metadata.gz: a44132e0d62673bb33d40984a571d0143924cd6f
+  data.tar.gz: e88c336217ade2bad4b5952af5d178fb413fe9ef
 SHA512:
-  metadata.gz: ef6e05623ef8e04259b2bd13315b97cd9e4647b105b41469d9b6ccf0e8de3e50421638bda94ba2a805bb5eb513799931b1ce0d6017b5bf5cfbd475e58415ea23
-  data.tar.gz: 3c72bf69f2bbd23f65f1b2ddc289029cd306927b5494d7d68034ffa557e9d0b435573f792d993111f0aa64ca0c948fa922423998535cd03882295d88750846c9
+  metadata.gz: 428001bf5a64de77ece58679cf7250173f0c11f5fa956bc437abb23307354e93ae4620e7dfe1a7f098ce11c9b3683ac398c26a4bddf45ed47b6053a2796506de
+  data.tar.gz: 0a131013da955c7b4c569aff0249b7de6e909f679cc53113ddc830549e52427fee054c119289f7e00e23cc7d1062fc98ba1247149696e912de0f4cc0b608e7d7

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: ruby
 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
   name: rack