puma 5.6.8 → 6.4.3

data/lib/puma/events.rb

@@ -1,52 +1,23 @@
 # frozen_string_literal: true
 
-require "puma/null_io"
-require 'puma/error_logger'
-require 'stringio'
-
 module Puma
-  # The default implement of an event sink object used by Server
-  # for when certain kinds of events occur in the life of the server.
-  #
-  # The methods available are the events that the Server fires.
-  #
-  class Events
-    class DefaultFormatter
-      def call(str)
-        str
-      end
-    end
-
-    class PidFormatter
-      def call(str)
-        "[#{$$}] #{str}"
-      end
-    end
-
-    # Create an Events object that prints to +stdout+ and +stderr+.
-    #
-    def initialize(stdout, stderr)
-      @formatter = DefaultFormatter.new
-      @stdout = stdout
-      @stderr = stderr
 
-      @debug = ENV.key? 'PUMA_DEBUG'
-      @error_logger = ErrorLogger.new(@stderr)
+  # This is an event sink used by `Puma::Server` to handle
+  # lifecycle events such as :on_booted, :on_restart, and :on_stopped.
+  # Using `Puma::DSL` it is possible to register callback hooks
+  # for each event type.
+  class Events
 
+    def initialize
       @hooks = Hash.new { |h,k| h[k] = [] }
     end
 
-    attr_reader :stdout, :stderr
-    attr_accessor :formatter
-
     # Fire callbacks for the named hook
-    #
     def fire(hook, *args)
       @hooks[hook].each { |t| t.call(*args) }
     end
 
     # Register a callback for a given hook
-    #
     def register(hook, obj=nil, &blk)
       if obj and blk
         raise "Specify either an object or a block, not both"
@@ -59,79 +30,6 @@ module Puma
       h
     end
 
-    # Write +str+ to +@stdout+
-    #
-    def log(str)
-      @stdout.puts format(str) if @stdout.respond_to? :puts
-
-      @stdout.flush unless @stdout.sync
-    rescue Errno::EPIPE
-    end
-
-    def write(str)
-      @stdout.write format(str)
-    end
-
-    def debug(str)
-      log("% #{str}") if @debug
-    end
-
-    # Write +str+ to +@stderr+
-    #
-    def error(str)
-      @error_logger.info(text: format("ERROR: #{str}"))
-      exit 1
-    end
-
-    def format(str)
-      formatter.call(str)
-    end
-
-    # An HTTP connection error has occurred.
-    # +error+ a connection exception, +req+ the request,
-    # and +text+ additional info
-    # @version 5.0.0
-    #
-    def connection_error(error, req, text="HTTP connection error")
-      @error_logger.info(error: error, req: req, text: text)
-    end
-
-    # An HTTP parse error has occurred.
-    # +error+ a parsing exception,
-    # and +req+ the request.
-    #
-    def parse_error(error, req)
-      @error_logger.info(error: error, req: req, text: 'HTTP parse error, malformed request')
-    end
-
-    # An SSL error has occurred.
-    # @param error <Puma::MiniSSL::SSLError>
-    # @param ssl_socket <Puma::MiniSSL::Socket>
-    #
-    def ssl_error(error, ssl_socket)
-      peeraddr = ssl_socket.peeraddr.last rescue "<unknown>"
-      peercert = ssl_socket.peercert
-      subject = peercert ? peercert.subject : nil
-      @error_logger.info(error: error, text: "SSL error, peer: #{peeraddr}, peer cert: #{subject}")
-    end
-
-    # An unknown error has occurred.
-    # +error+ an exception object, +req+ the request,
-    # and +text+ additional info
-    #
-    def unknown_error(error, req=nil, text="Unknown error")
-      @error_logger.info(error: error, req: req, text: text)
-    end
-
-    # Log occurred error debug dump.
-    # +error+ an exception object, +req+ the request,
-    # and +text+ additional info
-    # @version 5.0.0
-    #
-    def debug_error(error, req=nil, text="")
-      @error_logger.debug(error: error, req: req, text: text)
-    end
-
     def on_booted(&block)
       register(:on_booted, &block)
     end
@@ -155,23 +53,5 @@ module Puma
     def fire_on_stopped!
       fire(:on_stopped)
     end
-
-    DEFAULT = new(STDOUT, STDERR)
-
-    # Returns an Events object which writes its status to 2 StringIO
-    # objects.
-    #
-    def self.strings
-      Events.new StringIO.new, StringIO.new
-    end
-
-    def self.stdio
-      Events.new $stdout, $stderr
-    end
-
-    def self.null
-      n = NullIO.new
-      Events.new n, n
-    end
   end
 end

data/lib/puma/io_buffer.rb

@@ -1,11 +1,46 @@
 # frozen_string_literal: true
 
+require 'stringio'
+
 module Puma
-  class IOBuffer < String
-    def append(*args)
-      args.each { |a| concat(a) }
+  class IOBuffer < StringIO
+    def initialize
+      super.binmode
+    end
+
+    def empty?
+      length.zero?
     end
 
-    alias reset clear
+    def reset
+      truncate 0
+      rewind
+    end
+
+    def to_s
+      rewind
+      read
+    end
+
+    # Read & Reset - returns contents and resets
+    # @return [String] StringIO contents
+    def read_and_reset
+      rewind
+      str = read
+      truncate 0
+      rewind
+      str
+    end
+
+    alias_method :clear, :reset
+
+    # before Ruby 2.5, `write` would only take one argument
+    if RUBY_VERSION >= '2.5' && RUBY_ENGINE != 'truffleruby'
+      alias_method :append, :write
+    else
+      def append(*strs)
+        strs.each { |str| write str }
+      end
+    end
   end
 end

data/lib/puma/jruby_restart.rb

@@ -16,7 +16,8 @@ module Puma
     def self.chdir_exec(dir, argv)
       chdir(dir)
       cmd = argv.first
-      argv = ([:string] * argv.size).zip(argv).flatten
+      argv = ([:string] * argv.size).zip(argv)
+      argv.flatten!
       argv << :string
       argv << nil
       execlp(cmd, *argv)

data/lib/puma/launcher/bundle_pruner.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Puma
+  class Launcher
+
+    # This class is used to pickup Gemfile changes during
+    # application restarts.
+    class BundlePruner
+
+      def initialize(original_argv, extra_runtime_dependencies, log_writer)
+        @original_argv = Array(original_argv)
+        @extra_runtime_dependencies = Array(extra_runtime_dependencies)
+        @log_writer = log_writer
+      end
+
+      def prune
+        return if ENV['PUMA_BUNDLER_PRUNED']
+        return unless defined?(Bundler)
+
+        require_rubygems_min_version!
+
+        unless puma_wild_path
+          log "! Unable to prune Bundler environment, continuing"
+          return
+        end
+
+        dirs = paths_to_require_after_prune
+
+        log '* Pruning Bundler environment'
+        home = ENV['GEM_HOME']
+        bundle_gemfile = Bundler.original_env['BUNDLE_GEMFILE']
+        bundle_app_config = Bundler.original_env['BUNDLE_APP_CONFIG']
+
+        with_unbundled_env do
+          ENV['GEM_HOME'] = home
+          ENV['BUNDLE_GEMFILE'] = bundle_gemfile
+          ENV['PUMA_BUNDLER_PRUNED'] = '1'
+          ENV["BUNDLE_APP_CONFIG"] = bundle_app_config
+          args = [Gem.ruby, puma_wild_path, '-I', dirs.join(':')] + @original_argv
+          # Ruby 2.0+ defaults to true which breaks socket activation
+          args += [{:close_others => false}]
+          Kernel.exec(*args)
+        end
+      end
+
+      private
+
+      def require_rubygems_min_version!
+        min_version = Gem::Version.new('2.2')
+
+        return if min_version <= Gem::Version.new(Gem::VERSION)
+
+        raise "prune_bundler is not supported on your version of RubyGems. " \
+              "You must have RubyGems #{min_version}+ to use this feature."
+      end
+
+      def puma_wild_path
+        puma_lib_dir = puma_require_paths.detect { |x| File.exist? File.join(x, '../bin/puma-wild') }
+        File.expand_path(File.join(puma_lib_dir, '../bin/puma-wild'))
+      end
+
+      def with_unbundled_env
+        bundler_ver = Gem::Version.new(Bundler::VERSION)
+        if bundler_ver < Gem::Version.new('2.1.0')
+          Bundler.with_clean_env { yield }
+        else
+          Bundler.with_unbundled_env { yield }
+        end
+      end
+
+      def paths_to_require_after_prune
+        puma_require_paths + extra_runtime_deps_paths
+      end
+
+      def extra_runtime_deps_paths
+        t = @extra_runtime_dependencies.map do |dep_name|
+          if (spec = spec_for_gem(dep_name))
+            require_paths_for_gem(spec)
+          else
+            log "* Could not load extra dependency: #{dep_name}"
+            nil
+          end
+        end
+        t.flatten!; t.compact!; t
+      end
+
+      def puma_require_paths
+        require_paths_for_gem(spec_for_gem('puma'))
+      end
+
+      def spec_for_gem(gem_name)
+        Bundler.rubygems.loaded_specs(gem_name)
+      end
+
+      def require_paths_for_gem(gem_spec)
+        gem_spec.full_require_paths
+      end
+
+      def log(str)
+        @log_writer.log(str)
+      end
+    end
+  end
+end