puma 2.1.0 → 2.1.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.1.1 / 2013-06-20
+
+* 2 minor bug fixes:
+
+  * Fix daemonization on jruby
+  * Load the application before daemonizing. Fixes #285
+
 === 2.1.0 / 2013-06-18
 
 * 3 minor features:

data/lib/puma/cli.rb

@@ -39,9 +39,6 @@ module Puma
       @restart = false
       @phased_state = :idle
 
-      @io_redirected = false
-
-
       ENV['NEWRELIC_DISPATCHER'] ||= "puma"
 
       setup_options
@@ -366,7 +363,6 @@ module Puma
       append = @options[:redirect_append]
 
       if stdout
-        @io_redirected = true
         STDOUT.reopen stdout, (append ? "a" : "w")
         STDOUT.sync = true
         STDOUT.puts "=== puma startup: #{Time.now} ==="
@@ -409,64 +405,117 @@ module Puma
       end
     end
 
-    def run_single
+    def daemon?
+      @options[:daemon]
+    end
+
+    def jruby_daemon?
+      daemon? and jruby?
+    end
+
+    def output_header
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
       log "Puma #{Puma::Const::PUMA_VERSION} starting..."
       log "* Min threads: #{min_t}, max threads: #{max_t}"
       log "* Environment: #{ENV['RACK_ENV']}"
+    end
 
-      @binder.parse @options[:binds], self
+    def start_control(server, str)
+      require 'puma/app/status'
 
-      unless @config.app_configured?
-        error "No application configured, nothing to run"
-        exit 1
-      end
+      uri = URI.parse str
 
-      if @options[:daemon]
-        Process.daemon(true, @io_redirected)
+      app = Puma::App::Status.new server, self
+
+      if token = @options[:control_auth_token]
+        app.auth_token = token unless token.empty? or token == :none
       end
 
-      write_state
+      status = Puma::Server.new app, @events
+      status.min_threads = 0
+      status.max_threads = 1
 
-      server = Puma::Server.new @config.app, @events
-      server.binder = @binder
-      server.min_threads = min_t
-      server.max_threads = max_t
+      case uri.scheme
+      when "tcp"
+        log "* Starting status server on #{str}"
+        status.add_tcp_listener uri.host, uri.port
+      when "unix"
+        log "* Starting status server on #{str}"
+        path = "#{uri.host}#{uri.path}"
 
-      @server = server
+        status.add_unix_listener path
+      else
+        error "Invalid status URI: #{str}"
+      end
 
-      if str = @options[:control_url]
-        require 'puma/app/status'
+      status.run
+      @status = status
+    end
 
-        uri = URI.parse str
+    def run_single
+      already_daemon = false
 
-        app = Puma::App::Status.new server, self
+      if jruby_daemon?
+        require 'puma/jruby_restart'
 
-        if token = @options[:control_auth_token]
-          app.auth_token = token unless token.empty? or token == :none
+        if JRubyRestart.daemon?
+          # Bind before redirecting IO so binding errors show up on stdout/stderr
+          @binder.parse @options[:binds], self
         end
 
-        status = Puma::Server.new app, @events
-        status.min_threads = 0
-        status.max_threads = 1
+        already_daemon = JRubyRestart.daemon_init
+      end
 
-        case uri.scheme
-        when "tcp"
-          log "* Starting status server on #{str}"
-          status.add_tcp_listener uri.host, uri.port
-        when "unix"
-          log "* Starting status server on #{str}"
-          path = "#{uri.host}#{uri.path}"
+      output_header
 
-          status.add_unix_listener path
-        else
-          error "Invalid status URI: #{str}"
+      if !jruby_daemon?
+        @binder.parse @options[:binds], self
+      end
+
+      unless @config.app_configured?
+        error "No application configured, nothing to run"
+        exit 1
+      end
+
+      # Load the app before we daemonize.
+      begin
+        app = @config.app
+      rescue Exception => e
+        log "! Unable to load application"
+        raise e
+      end
+
+      if jruby_daemon?
+        unless already_daemon
+          require 'puma/jruby_restart'
+
+          pid = nil
+
+          Signal.trap "SIGUSR2" do
+            log "* Started new process #{pid} as daemon..."
+            exit
+          end
+
+          pid = JRubyRestart.daemon_start(@restart_dir, @restart_argv)
+          sleep
         end
+      elsif daemon?
+        Process.daemon(true)
+      end
+
+      write_state
+
+      server = Puma::Server.new app, @events
+      server.binder = @binder
+      server.min_threads = @options[:min_threads]
+      server.max_threads = @options[:max_threads]
 
-        status.run
-        @status = status
+      @server = server
+
+      if str = @options[:control_url]
+        start_control server, str
       end
 
       begin
@@ -726,7 +775,7 @@ module Puma
       @check_pipe, @suicide_pipe = Puma::Util.pipe
 
       if @options[:daemon]
-        Process.daemon(true, @io_redirected)
+        Process.daemon(true)
       else
         log "Use Ctrl-C to stop"
       end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.1.0".freeze
+    PUMA_VERSION = VERSION = "2.1.1".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/daemon_ext.rb

@@ -9,7 +9,7 @@ module Process
     Dir.chdir "/" unless nochdir     # Release old working directory.
 
     if !noclose
-      null = File.open "/dev/null"
+      null = File.open "/dev/null", "w+"
       STDIN.reopen null
       STDOUT.reopen null
       STDERR.reopen null

data/lib/puma/jruby_restart.rb

@@ -7,6 +7,9 @@ module Puma
 
     attach_function :execlp, [:string, :varargs], :int
     attach_function :chdir, [:string], :int
+    attach_function :fork, [], :int
+    attach_function :exit, [:int], :void
+    attach_function :setsid, [], :int
 
     def self.chdir_exec(dir, argv)
       chdir(dir)
@@ -17,6 +20,41 @@ module Puma
       execlp(cmd, *argv)
       raise SystemCallError.new(FFI.errno)
     end
+
+    def self.daemon?
+      ENV.key? 'PUMA_DAEMON_RESTART'
+    end
+
+    def self.daemon_init
+      return false unless ENV.key? 'PUMA_DAEMON_RESTART'
+
+      master = ENV['PUMA_DAEMON_RESTART']
+      Process.kill "SIGUSR2", master.to_i
+
+      setsid
+
+      null = File.open "/dev/null", "w+"
+      STDIN.reopen null
+      STDOUT.reopen null
+      STDERR.reopen null
+
+      true
+    end
+
+    def self.daemon_start(dir, argv)
+      ENV['PUMA_DAEMON_RESTART'] = Process.pid.to_s
+
+      cmd = argv.first
+      argv = ([:string] * argv.size).zip(argv).flatten
+      argv << :string
+      argv << nil
+
+      chdir(dir)
+      ret = fork
+      return ret if ret != 0
+      execlp(cmd, *argv)
+      raise SystemCallError.new(FFI.errno)
+    end
   end
 end
 

data/puma.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-06-18"
+  s.date = "2013-06-20"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
   s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
       s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
     s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
+    s.add_dependency(%q<hoe>, ["~> 3.6"])
   end
 end

data/test/test_integration.rb

@@ -28,7 +28,11 @@ class TestIntegration < Test::Unit::TestCase
 
     if @server
       Process.kill "INT", @server.pid
-      Process.wait @server.pid
+      begin
+        Process.wait @server.pid
+      rescue Errno::ECHILD
+      end
+
       @server.close
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
   for Ruby/Rack applications. Puma is intended for use in both development and production
   environments. In order to get the best throughput, it is highly recommended that
@@ -95,6 +95,11 @@ extensions:
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
+- README.md
+- docs/config.md
+- docs/nginx.md
+- tools/jungle/init.d/README.md
+- tools/jungle/upstart/README.md
 files:
 - COPYING
 - Gemfile