puma 2.9.0-java → 2.9.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606df9e31f26a18cd3e3a1219615c9f6ac80b634
-  data.tar.gz: 0c94555a3f56ed48cece59cadeb49539727f1483
+  metadata.gz: 0922d7405e2fb42668eb994933edfcc57234ab01
+  data.tar.gz: 8c287132402d71095f8210b61124fd75a7c96288
 SHA512:
-  metadata.gz: 1f766ef76252ad9271a3523c04287cce012676173511c834b8f73cb8dce29ea07ad414cc48de219b6635123781d2a7a88a56caaaa1f20488709b99ea3685609e
-  data.tar.gz: 3b7dd8bc4f8f8102b907009ce1a8dae858a770ddc1c99b584942bb6d63578a893bc6e1763216bcd3a0d9d2817ac435f37e9b00fad587b84fc0dbf403a5b604b7
+  metadata.gz: 999411b1b2fe55fa575aa87b2b513f7607fa79f8f83761d8685973386f1c097f2c8ea5b8613fd0e0c77982c51e432910e7ec31237aa2c0e6af981ebb7896819f
+  data.tar.gz: 5ea012d1b1689c4da2e2be5272bc8b3785e037b7e3368bc33a04108ee3904abf100ffc5fc9ee06618b28d499bedd40fc5dc7a36cbfb37608f0eacb7650d037fa

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.9.1 / 2014-09-05
+
+* 4 bug fixes:
+  * Cleanup the SSL related structures properly, fixes memory leak
+  * Fix thread spawning edge case.
+  * Force a worker check after a worker boots, don't wait 5sec. Fixes #574
+  * Implement SIGHUP for logs reopening
+
+* 2 PRs merged:
+  * Merge pull request #561 from theoldreader/sighup
+  * Merge pull request #570 from havenwood/spawn-thread-edge-case
+
 === 2.9.0 / 2014-07-12
 
 * 1 minor feature:

data/docs/signals.md

@@ -38,5 +38,6 @@ Puma cluster responds to these signals:
 - `TERM` send `TERM` to worker. Worker will attempt to finish then exit.
 - `USR2` restart workers
 - `USR1` restart workers in phases, a rolling restart.
+- `HUP`  reopen log files defined in stdout_redirect configuration parameter
 - `INT` equivalent of sending Ctrl-C to cluster. Will attempt to finish then exit.
 - `CHLD`

data/ext/puma_http11/mini_ssl.c

@@ -13,8 +13,8 @@ typedef struct {
 } ms_conn;
 
 void engine_free(ms_conn* conn) {
-  BIO_free(conn->read);
-  BIO_free(conn->write);
+  SSL_free(conn->ssl);
+  SSL_CTX_free(conn->ctx);
 
   free(conn);
 }

data/lib/puma/cli.rb

@@ -537,6 +537,14 @@ module Puma
         log "*** SIGTERM not implemented, signal based gracefully stopping unavailable!"
       end
 
+      begin
+        Signal.trap "SIGHUP" do
+          redirect_io
+        end
+      rescue Exception
+        log "*** SIGHUP not implemented, signal based logs reopening unavailable!"
+      end
+
       if jruby?
         Signal.trap("INT") do
           @status = :exit
@@ -564,6 +572,10 @@ module Puma
       true
     end
 
+    def redirect_io
+      @runner.redirect_io
+    end
+
     def stats
       @runner.stats
     end

data/lib/puma/cluster.rb

@@ -36,6 +36,12 @@ module Puma
       end
     end
 
+    def redirect_io
+      super
+
+      @workers.each { |x| x.hup }
+    end
+
     class Worker
       def initialize(idx, pid, phase)
         @index = idx
@@ -82,6 +88,11 @@ module Puma
         Process.kill "KILL", @pid
       rescue Errno::ESRCH
       end
+
+      def hup
+        Process.kill "HUP", @pid
+      rescue Errno::ESRCH
+      end
     end
 
     def spawn_workers
@@ -104,9 +115,9 @@ module Puma
     end
 
     def next_worker_index
-      all_positions =  0...@options[:workers] 
+      all_positions =  0...@options[:workers]
       occupied_positions = @workers.map { |w| w.index }
-      available_positions = all_positions.to_a - occupied_positions 
+      available_positions = all_positions.to_a - occupied_positions
       available_positions.first
     end
 
@@ -114,8 +125,8 @@ module Puma
       @workers.count { |w| !w.booted? } == 0
     end
 
-    def check_workers
-      return if @next_check && @next_check >= Time.now
+    def check_workers(force=false)
+      return if !force && @next_check && @next_check >= Time.now
 
       @next_check = Time.now + 5
 
@@ -172,6 +183,7 @@ module Puma
       $0 = "puma: cluster worker #{index}: #{master}"
       Signal.trap "SIGINT", "IGNORE"
 
+      @workers = []
       @master_read.close
       @suicide_pipe.close
 
@@ -345,6 +357,8 @@ module Puma
           begin
             res = IO.select([read], nil, nil, 5)
 
+            force_check = false
+
             if res
               req = read.read_nonblock(1)
 
@@ -357,6 +371,7 @@ module Puma
                 when "b"
                   w.boot!
                   log "- Worker #{w.index} (pid: #{pid}) booted, phase: #{w.phase}"
+                  force_check = true
                 when "p"
                   w.ping!
                 end
@@ -370,7 +385,7 @@ module Puma
               @phased_restart = false
             end
 
-            check_workers
+            check_workers force_check
 
           rescue Interrupt
             @status = :stop

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.9.0".freeze
+    PUMA_VERSION = VERSION = "2.9.1".freeze
     CODE_NAME = "Team High Five".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/thread_pool.rb

@@ -114,7 +114,7 @@ module Puma
 
         @todo << work
 
-        if @waiting == 0 and @spawned < @max
+        if @waiting < @todo.size and @spawned < @max
           spawn_thread
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack