puma 2.0.0.b4-java → 2.0.0.b7-java

data/lib/puma/client.rb

@@ -36,14 +36,22 @@ module Puma
       @timeout_at = nil
 
       @requests_served = 0
+      @hijacked = false
     end
 
-    attr_reader :env, :to_io, :body, :io, :timeout_at, :ready
+    attr_reader :env, :to_io, :body, :io, :timeout_at, :ready, :hijacked
 
     def inspect
       "#<Puma::Client:0x#{object_id.to_s(16)} @ready=#{@ready.inspect}>"
     end
 
+    # For the hijack protocol (allows us to just put the Client object
+    # into the env)
+    def call
+      @hijacked = true
+      env[HIJACK_IO] ||= @io
+    end
+
     def set_timeout(val)
       @timeout_at = Time.now + val
     end

data/lib/puma/configuration.rb

@@ -1,4 +1,14 @@
 module Puma
+
+  # The CLI exports it's Configuration object here to allow
+  # apps to pick it up. An app needs to use it conditionally though
+  # since it is not set if the app is launched via another
+  # mechanism than the CLI class.
+
+  class << self
+    attr_accessor :cli_config
+  end
+
   class Configuration
     DefaultRackup = "config.ru"
 
@@ -44,26 +54,39 @@ module Puma
       end
     end
 
+    # Injects the Configuration object into the env
+    class ConfigMiddleware
+      def initialize(config, app)
+        @config = config
+        @app = app
+      end
+
+      def call(env)
+        env[Const::PUMA_CONFIG] = @config
+        @app.call(env)
+      end
+    end
+
     # Load the specified rackup file, pull an options from
     # the rackup file, and set @app.
     #
     def app
-      if app = @options[:app]
-        return app
-      end
+      app = @options[:app]
 
-      path = @options[:rackup] || DefaultRackup
+      unless app
+        path = @options[:rackup] || DefaultRackup
 
-      unless File.exists?(path)
-        raise "Missing rackup file '#{path}'"
-      end
+        unless File.exists?(path)
+          raise "Missing rackup file '#{path}'"
+        end
 
-      app, options = Rack::Builder.parse_file path
-      @options.merge! options
+        app, options = Rack::Builder.parse_file path
+        @options.merge! options
 
-      options.each do |key,val|
-        if key.to_s[0,4] == "bind"
-          @options[:binds] << val
+        options.each do |key,val|
+          if key.to_s[0,4] == "bind"
+            @options[:binds] << val
+          end
         end
       end
 
@@ -72,7 +95,7 @@ module Puma
         app = Rack::CommonLogger.new(app, logger)
       end
 
-      return app
+      return ConfigMiddleware.new(self, app)
     end
 
     def setup_random_token
@@ -176,6 +199,14 @@ module Puma
         @options[:on_restart] << blk
       end
 
+      # Command to use to restart puma. This should be just how to
+      # load puma itself (ie. 'ruby -Ilib bin/puma'), not the arguments
+      # to puma, as those are the same as the original process.
+      #
+      def restart_command(cmd)
+        @options[:request_cmd] = cmd
+      end
+
       # Store the pid of the server in the file at +path+.
       def pidfile(path)
         @options[:pidfile] = path
@@ -234,9 +265,19 @@ module Puma
         @options[:workers] = count.to_i
       end
 
+      # *Cluster mode only* Code to run when a worker boots to setup
+      # the process before booting the app.
+      #
+      # This can be called multiple times to add hooks.
+      #
+      def on_worker_boot(&block)
+        @options[:worker_boot] << block
+      end
+
       # The directory to operate out of.
       def directory(dir)
         @options[:directory] = dir.to_s
+        @options[:worker_directory] = dir.to_s
       end
     end
   end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b4".freeze
+    PUMA_VERSION = VERSION = "2.0.0.b7".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
@@ -101,6 +101,7 @@ module Puma
     SERVER_PORT = "SERVER_PORT".freeze
     HTTP_HOST = "HTTP_HOST".freeze
     PORT_80 = "80".freeze
+    PORT_443 = "443".freeze
     LOCALHOST = "localhost".freeze
 
     SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze
@@ -119,6 +120,7 @@ module Puma
     RACK_URL_SCHEME = "rack.url_scheme".freeze
     RACK_AFTER_REPLY = "rack.after_reply".freeze
     PUMA_SOCKET = "puma.socket".freeze
+    PUMA_CONFIG = "puma.config".freeze
 
     HTTP = "http".freeze
     HTTPS = "https".freeze
@@ -147,5 +149,9 @@ module Puma
     COLON = ": ".freeze
 
     NEWLINE = "\n".freeze
+
+    HIJACK_P = "rack.hijack?".freeze
+    HIJACK = "rack.hijack".freeze
+    HIJACK_IO = "rack.hijack_io".freeze
   end
 end

data/lib/puma/jruby_restart.rb

@@ -8,12 +8,12 @@ module Puma
     attach_function :execlp, [:string, :varargs], :int
     attach_function :chdir, [:string], :int
 
-    def self.chdir_exec(dir, cmd, *argv)
+    def self.chdir_exec(dir, argv)
       chdir(dir)
-      argv.unshift(cmd)
+      cmd = argv.first
       argv = ([:string] * argv.size).zip(argv).flatten
-      argv <<:int
-      argv << 0
+      argv << :string
+      argv << nil
       execlp(cmd, *argv)
       raise SystemCallError.new(FFI.errno)
     end

data/lib/puma/minissl.rb

@@ -1,137 +1,139 @@
-module Puma::MiniSSL
-  class Socket
-    def initialize(socket, engine)
-      @socket = socket
-      @engine = engine
-    end
+module Puma
+  module MiniSSL
+    class Socket
+      def initialize(socket, engine)
+        @socket = socket
+        @engine = engine
+      end
 
-    def to_io
-      @socket
-    end
+      def to_io
+        @socket
+      end
 
-    def readpartial(size)
-      while true
-        output = @engine.read
-        return output if output
+      def readpartial(size)
+        while true
+          output = @engine.read
+          return output if output
 
-        data = @socket.readpartial(size)
-        @engine.inject(data)
-        output = @engine.read
+          data = @socket.readpartial(size)
+          @engine.inject(data)
+          output = @engine.read
 
-        return output if output
+          return output if output
 
-        while neg_data = @engine.extract
-          @socket.write neg_data
+          while neg_data = @engine.extract
+            @socket.write neg_data
+          end
         end
       end
-    end
 
-    def read_nonblock(size)
-      while true
-        output = @engine.read
-        return output if output
+      def read_nonblock(size)
+        while true
+          output = @engine.read
+          return output if output
 
-        data = @socket.read_nonblock(size)
+          data = @socket.read_nonblock(size)
 
-        @engine.inject(data)
-        output = @engine.read
+          @engine.inject(data)
+          output = @engine.read
 
-        return output if output
+          return output if output
 
-        while neg_data = @engine.extract
-          @socket.write neg_data
+          while neg_data = @engine.extract
+            @socket.write neg_data
+          end
         end
       end
-    end
 
-    def write(data)
-      need = data.size
+      def write(data)
+        need = data.size
 
-      while true
-        wrote = @engine.write data
-        enc = @engine.extract
+        while true
+          wrote = @engine.write data
+          enc = @engine.extract
 
-        if enc
-          @socket.syswrite enc
-        end
+          if enc
+            @socket.syswrite enc
+          end
 
-        need -= wrote
+          need -= wrote
 
-        return data.size if need == 0
+          return data.size if need == 0
 
-        data = data[need..-1]
+          data = data[need..-1]
+        end
       end
-    end
 
-    alias_method :syswrite, :write
+      alias_method :syswrite, :write
 
-    def flush
-      @socket.flush
-    end
+      def flush
+        @socket.flush
+      end
 
-    def close
-      @socket.close
-    end
+      def close
+        @socket.close
+      end
 
-    def peeraddr
-      @socket.peeraddr
+      def peeraddr
+        @socket.peeraddr
+      end
     end
-  end
 
-  class Context
-    attr_accessor :verify_mode
+    class Context
+      attr_accessor :verify_mode
 
-    attr_reader :key
-    attr_reader :cert
+      attr_reader :key
+      attr_reader :cert
 
-    def key=(key)
-      raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
-      @key = key
-    end
+      def key=(key)
+        raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
+        @key = key
+      end
 
-    def cert=(cert)
-      raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
-      @cert = cert
+      def cert=(cert)
+        raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
+        @cert = cert
+      end
     end
-  end
 
-  VERIFY_NONE = 0
-  VERIFY_PEER = 1
+    VERIFY_NONE = 0
+    VERIFY_PEER = 1
 
-  #if defined?(JRUBY_VERSION)
+    #if defined?(JRUBY_VERSION)
     #class Engine
-      #def self.server(key, cert)
-        #new(key, cert)
-      #end
+    #def self.server(key, cert)
+    #new(key, cert)
+    #end
+    #end
     #end
-  #end
 
-  class Server
-    def initialize(socket, ctx)
-      @socket = socket
-      @ctx = ctx
-    end
+    class Server
+      def initialize(socket, ctx)
+        @socket = socket
+        @ctx = ctx
+      end
 
-    def to_io
-      @socket
-    end
+      def to_io
+        @socket
+      end
 
-    def accept
-      io = @socket.accept
-      engine = Engine.server @ctx.key, @ctx.cert
+      def accept
+        io = @socket.accept
+        engine = Engine.server @ctx.key, @ctx.cert
 
-      Socket.new io, engine
-    end
+        Socket.new io, engine
+      end
 
-    def accept_nonblock
-      io = @socket.accept_nonblock
-      engine = Engine.server @ctx.key, @ctx.cert
+      def accept_nonblock
+        io = @socket.accept_nonblock
+        engine = Engine.server @ctx.key, @ctx.cert
 
-      Socket.new io, engine
-    end
+        Socket.new io, engine
+      end
 
-    def close
-      @socket.close
+      def close
+        @socket.close
+      end
     end
   end
 end

data/lib/puma/rack_default.rb

@@ -0,0 +1,7 @@
+require 'rack/handler/puma'
+
+module Rack::Handler
+  def self.default(options = {})
+    Rack::Handler::Puma
+  end
+end

data/lib/puma/reactor.rb

@@ -1,3 +1,5 @@
+require 'puma/util'
+
 module Puma
   class Reactor
     DefaultSleepFor = 5
@@ -8,7 +10,7 @@ module Puma
       @app_pool = app_pool
 
       @mutex = Mutex.new
-      @ready, @trigger = IO.pipe
+      @ready, @trigger = Puma::Util.pipe
       @input = []
       @sleep_for = DefaultSleepFor
       @timeouts = []
@@ -48,7 +50,9 @@ module Puma
               # list or we'll accidentally close the socket when
               # it's in use!
               if c.timeout_at
-                @timeouts.delete c
+                @mutex.synchronize do
+                  @timeouts.delete c
+                end
               end
 
               begin
@@ -76,19 +80,24 @@ module Puma
         end
 
         unless @timeouts.empty?
-          now = Time.now
+          @mutex.synchronize do
+            now = Time.now
 
-          while @timeouts.first.timeout_at < now
-            c = @timeouts.shift
-            sockets.delete c
-            c.close
+            while @timeouts.first.timeout_at < now
+              c = @timeouts.shift
+              sockets.delete c
+              c.close
 
-            break if @timeouts.empty?
-          end
+              break if @timeouts.empty?
+            end
 
-          calculate_sleep
+            calculate_sleep
+          end
         end
       end
+    ensure
+      @trigger.close
+      @ready.close
     end
 
     def run_in_thread
@@ -135,11 +144,18 @@ module Puma
 
     # Close all watched sockets and clear them from being watched
     def clear!
-      @trigger << "c"
+      begin
+        @trigger << "c"
+      rescue IOError
+      end
     end
 
     def shutdown
-      @trigger << "!"
+      begin
+        @trigger << "!"
+      rescue IOError
+      end
+
       @thread.join
     end
   end