puma 2.5.0-java → 2.5.1-java

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.5.1 / 2013-08-13
+
+* 2 bug fixes:
+
+  * Keep jruby daemon mode from retrying on a hot restart
+  * Extract version from const.rb in gemspec
+
 === 2.5.0 / 2013-08-08
 
 * 2 minor features:

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.5.0".freeze
+    PUMA_VERSION = VERSION = "2.5.1".freeze
     CODE_NAME = "Astronaut Shoelaces"
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/jruby_restart.rb

@@ -21,15 +21,34 @@ module Puma
       raise SystemCallError.new(FFI.errno)
     end
 
+    PermKey = 'PUMA_DAEMON_PERM'
+    RestartKey = 'PUMA_DAEMON_RESTART'
+
+    # Called to tell things "Your now always in daemon mode,
+    # don't try to reenter it."
+    #
+    def self.perm_daemonize
+      ENV[PermKey] = "1"
+    end
+
     def self.daemon?
-      ENV.key? 'PUMA_DAEMON_RESTART'
+      ENV.key?(PermKey) || ENV.key?(RestartKey)
     end
 
     def self.daemon_init
-      return false unless ENV.key? 'PUMA_DAEMON_RESTART'
+      return true if ENV.key?(PermKey)
+
+      return false unless ENV.key? RestartKey
+
+      master = ENV[RestartKey]
+
+      # In case the master disappears early
+      begin
+        Process.kill "SIGUSR2", master.to_i
+      rescue SystemCallError => e
+      end
 
-      master = ENV['PUMA_DAEMON_RESTART']
-      Process.kill "SIGUSR2", master.to_i
+      ENV[RestartKey] = ""
 
       setsid
 

data/lib/puma/single.rb

@@ -47,7 +47,9 @@ module Puma
       output_header "single"
 
       if jruby_daemon?
-        unless already_daemon
+        if already_daemon
+          JRubyRestart.perm_daemonize
+        else
           pid = nil
 
           Signal.trap "SIGUSR2" do

data/puma.gemspec

@@ -3,9 +3,16 @@
 # This is only used when puma is a git dep from Bundler, so it's a little
 # weird.
 
+d = File.read(File.expand_path("../lib/puma/const.rb", __FILE__))
+if d =~ /VERSION = "(\d+\.\d+\.\d+)"/
+  version = $1
+else
+  version = "0.0.1"
+end
+
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = Puma::Const::PUMA_VERSION
+  s.version = version
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]

metadata

@@ -2,14 +2,14 @@
 name: puma
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.5.0
+  version: 2.5.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack