passenger 5.0.21 → 5.0.22

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -26,7 +26,8 @@
 require 'etc'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'standalone/control_utils'
-PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
@@ -43,9 +44,17 @@ module PhusionPassenger
         end
 
         def wait_until_engine_has_exited
-          lock = DaemonController::LockFile.new(read_watchdog_lock_file_path!)
-          lock.shared_lock do
-            # Do nothing
+          read_and_delete_report_file!
+          if PlatformInfo.supports_flock?
+            lock = DaemonController::LockFile.new(@watchdog_lock_file_path)
+            lock.shared_lock do
+              # Do nothing
+            end
+          else
+            pid = @engine.pid
+            while process_is_alive?(pid)
+              sleep 1
+            end
           end
         end
 
@@ -136,14 +145,20 @@ module PhusionPassenger
           if @options[:turbocaching] == false
             command << " --disable-turbocaching"
           end
+          if @options[:abort_websockets_on_process_shutdown] == false
+            command << " --no-abort-websockets-on-process-shutdown"
+          end
+          add_param(command, :force_max_concurrent_requests_per_process, "--force-max-concurrent-requests-per-process")
           add_flag_param(command, :load_shell_envvars, "--load-shell-envvars")
           add_param(command, :max_pool_size, "--max-pool-size")
           add_param(command, :min_instances, "--min-instances")
           add_param(command, :pool_idle_time, "--pool-idle-time")
           add_param(command, :max_preloader_idle_time, "--max-preloader-idle-time")
+          add_param(command, :max_request_queue_size, "--max-request-queue-size")
           add_enterprise_param(command, :concurrency_model, "--concurrency-model")
           add_enterprise_param(command, :thread_count, "--app-thread-count")
           add_enterprise_param(command, :max_request_time, "--max-request-time")
+          add_enterprise_param(command, :memory_limit, "--memory-limit")
           add_enterprise_flag_param(command, :rolling_restarts, "--rolling-restarts")
           add_enterprise_flag_param(command, :resist_deployment_errors, "--resist-deployment-errors")
           add_enterprise_flag_param(command, :debugger, "--debugger")
@@ -216,14 +231,23 @@ module PhusionPassenger
           @report_file_path ||= "#{@working_dir}/report.json"
         end
 
-        def read_watchdog_lock_file_path!
-          @watchdog_lock_file_path ||= begin
-            report = File.open(report_file_path, "r:utf-8") do |f|
-              Utils::JSON.parse(f.read)
-            end
-            # The report file may contain sensitive information, so delete it.
-            File.unlink(report_file_path)
-            report["instance_dir"] + "/lock"
+        def read_and_delete_report_file!
+          report = File.open(report_file_path, "r:utf-8") do |f|
+            Utils::JSON.parse(f.read)
+          end
+          # The report file may contain sensitive information, so delete it.
+          File.unlink(report_file_path)
+          @watchdog_lock_file_path = report["instance_dir"] + "/lock"
+        end
+
+        def process_is_alive?(pid)
+          begin
+            Process.kill(0, pid)
+            true
+          rescue Errno::ESRCH
+            false
+          rescue SystemCallError => e
+            true
           end
         end
 

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb

@@ -25,6 +25,7 @@
 require 'erb'
 require 'etc'
 PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'standalone/control_utils'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
@@ -37,9 +38,12 @@ module PhusionPassenger
       module NginxEngine
       private
         def start_engine_real
+          write_nginx_config_file(nginx_config_path)
+          maybe_debug_nginx_config
+          test_nginx_config
+
           Standalone::ControlUtils.require_daemon_controller
           @engine = DaemonController.new(build_daemon_controller_options)
-          write_nginx_config_file(nginx_config_path)
 
           begin
             @engine.start
@@ -84,10 +88,60 @@ module PhusionPassenger
               end
             end
           end
-        rescue Errno::ECONNREFUSED, Errno::ECONNRESET
+        rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ENOENT
         end
 
 
+        def maybe_debug_nginx_config
+          if @options[:debug_nginx_config]
+            File.open(nginx_config_path, 'rb') do |f|
+              puts(f.read)
+            end
+            exit
+          end
+        end
+
+        def test_nginx_config
+          command = "#{Shellwords.escape @nginx_binary}" \
+            " -c #{Shellwords.escape nginx_config_path}" \
+            " -p #{Shellwords.escape @working_dir}" \
+            " -t"
+          output = `#{command} 2>&1`
+          if $? && $?.exitstatus != 0
+            output.gsub!(nginx_config_path, 'nginx.conf')
+            output = PlatformInfo.send(:reindent, output, 4)
+
+            message = "*** ERROR: the Nginx configuration that #{PROGRAM_NAME}" \
+              " Standalone generated internally contains problems. The error " \
+              "message returned by the Nginx engine is:\n\n" \
+              "#{output}\n\n"
+            if @options[:nginx_config_template]
+              message << "This probably means that you have a problem in your " \
+                "Nginx configuration template. Please fix your template.\n\n" \
+                "Tip: to debug your template, re-run #{SHORT_PROGRAM_NAME} " \
+                "Standalone with the `--debug-nginx-config` option. This " \
+                "allows you to see how the final Nginx config file looks like."
+            else
+              debug_log_file = Utils::TmpIO.new('passenger-standalone',
+                :suffix => '.log', :binary => true, :unlink_immediately => false)
+              begin
+                File.open(nginx_config_path, 'rb') do |f|
+                  debug_log_file.write(f.read)
+                end
+              ensure
+                debug_log_file.close
+              end
+              message << "This probably means that you have found a bug in " \
+                "#{PROGRAM_NAME} Standalone. Please report this bug to our " \
+                "Github issue tracker: https://github.com/phusion/passenger/issues\n\n" \
+                "In the bug report, please include this error message, as " \
+                "well as the contents of the file #{debug_log_file.path}"
+            end
+
+            abort(message)
+          end
+        end
+
         def build_daemon_controller_options
           if @options[:socket_file]
             ping_spec = [:unix, @options[:socket_file]]
@@ -96,7 +150,7 @@ module PhusionPassenger
           end
           return {
             :identifier    => 'Nginx',
-            :start_command => "#{@nginx_binary} " +
+            :start_command => "#{Shellwords.escape @nginx_binary} " +
               "-c #{Shellwords.escape nginx_config_path} " +
               "-p #{Shellwords.escape @working_dir}",
             :ping_command  => ping_spec,
@@ -113,14 +167,17 @@ module PhusionPassenger
         def write_nginx_config_file(path)
           File.open(path, 'w') do |f|
             f.chmod(0644)
-            erb = ERB.new(File.read(nginx_config_template_filename), nil, "-")
+            erb = ERB.new(File.read(nginx_config_template_filename), nil,
+              "-", next_eoutvar)
             erb.filename = nginx_config_template_filename
-            current_user = Etc.getpwuid(Process.uid).name
 
             # The template requires some helper methods which are defined in start_command.rb.
-            output = erb.result(binding)
+            output = erb.result(get_binding)
             f.write(output)
-            puts output if debugging?
+
+            if debugging? && !@options[:debug_nginx_config]
+              puts output
+            end
           end
         end
 
@@ -137,6 +194,12 @@ module PhusionPassenger
           return ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
         end
 
+        def next_eoutvar
+          @next_eoutvar_index ||= 0
+          @next_eoutvar_index += 1
+          "_erbout#{@next_eoutvar_index}"
+        end
+
         #### Config file template helpers ####
 
         def nginx_listen_address(options = @options)
@@ -161,9 +224,27 @@ module PhusionPassenger
           return group.name
         end
 
-        def nginx_option(nginx_config_name, option_name)
-          if @options.has_key?(option_name)
-            value = @options[option_name]
+        def nginx_http_option(option_name)
+          nginx_option(@options, option_name)
+        end
+
+        def nginx_option(options, option_name, nginx_config_name = nil)
+          if options.is_a?(Symbol)
+            # Support old syntax for backward compatibility:
+            # nginx_option(nginx_config_name, option_name)
+            nginx_config_name = options
+            options = @options
+          end
+
+          if options.key?(option_name)
+            nginx_config_name ||= begin
+              if option_name.to_s =~ /^union_station_/
+                option_name
+              else
+                "passenger_#{option_name}"
+              end
+            end
+            value = options[option_name]
             if value.is_a?(String)
               value = "'#{value}'"
             elsif value == true
@@ -175,16 +256,44 @@ module PhusionPassenger
           end
         end
 
+        # Method exists for backward compatiblity with old Nginx config templates
+        def boolean_config_value(val)
+          val ? "on" : "off"
+        end
+
+        def include_passenger_internal_template(name, indent = 0, fix_existing_indenting = true, the_binding = get_binding)
+          path = "#{PhusionPassenger.resources_dir}/templates/standalone/#{name}"
+          erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+          erb.filename = path
+          result = erb.result(the_binding)
+
+          if fix_existing_indenting
+            # Remove extraneous indenting by 'if' blocks
+            # and collapse multiple empty newlines
+            result.gsub!(/;[\n ]+/, ";\n")
+          end
+
+          # Set indenting
+          result.gsub!(/^/, " " * indent)
+          result.gsub!(/\A +/, '')
+
+          result
+        end
+
+        def current_user
+          Etc.getpwuid(Process.uid).name
+        end
+
+        def get_binding
+          binding
+        end
+
         def default_group_for(username)
           user = Etc.getpwnam(username)
           group = Etc.getgrgid(user.gid)
           return group.name
         end
 
-        def boolean_config_value(val)
-          return val ? "on" : "off"
-        end
-
         def serialize_strset(*items)
           if "".respond_to?(:force_encoding)
             items = items.map { |x| x.force_encoding('binary') }

data/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -34,8 +34,11 @@ module PhusionPassenger
 
     class StatusCommand < Command
       def run
-        @options = { :port => 3000 }
         parse_options
+        load_local_config_file
+        load_env_config
+        remerge_all_options
+
         find_pid_file
         create_controller
         begin
@@ -54,15 +57,16 @@ module PhusionPassenger
     private
       def self.create_option_parser(options)
         OptionParser.new do |opts|
+          defaults = CONFIG_DEFAULTS
           nl = "\n" + ' ' * 37
-          opts.banner = "Usage: passenger status [OPTIONS]\n"
+          opts.banner = "Usage: passenger status [OPTIONS] [APP DIR]\n"
           opts.separator "Shows the status of a running #{PROGRAM_NAME} Standalone instance."
           opts.separator ""
 
           opts.separator "Options:"
           opts.on("-p", "--port NUMBER", Integer,
             "The port number of the #{PROGRAM_NAME}#{nl}" +
-            "instance. Default: 3000") do |value|
+            "instance. Default: #{defaults[:port]}") do |value|
             options[:port] = value
           end
           opts.on("--pid-file FILE", String,
@@ -73,23 +77,34 @@ module PhusionPassenger
         end
       end
 
-      def find_pid_file
-        return if @options[:pid_file]
+      def load_local_config_file
+        @local_options = ConfigUtils.
+          load_local_config_file_from_app_dir_param!(@argv)
+      end
+
+      def load_env_config
+        @env_options = ConfigUtils.load_env_config!
+      end
 
-        logical_pwd = Dir.logical_pwd
+      def remerge_all_options
+        @options = ConfigUtils.remerge_all_config(@global_options,
+          @local_options, @env_options, @parsed_options)
+      end
+
+      def execution_root
+        @argv[0] || Dir.logical_pwd
+      end
 
-        ["tmp/pids", "."].each do |dir|
-          path = File.absolute_logical_path(
-            "#{dir}/passenger.#{@options[:port]}.pid",
-            logical_pwd)
-          if File.exist?(path)
-            @options[:pid_file] = path
-            return
+      def find_pid_file
+        ConfigUtils.find_pid_and_log_file(execution_root, @options)
+        if !@options[:pid_file]
+          if @options[:ignore_pid_not_found]
+            exit
+          else
+            Standalone::ControlUtils.warn_pid_file_not_found(@options)
+            exit 1
           end
         end
-
-        Standalone::ControlUtils.warn_pid_file_not_found(@options)
-        exit 1
       end
 
       def create_controller

data/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -34,8 +34,11 @@ module PhusionPassenger
 
     class StopCommand < Command
       def run
-        @options = { :port => 3000 }
         parse_options
+        load_local_config_file
+        load_env_config
+        remerge_all_options
+
         find_pid_file
         create_controller
         begin
@@ -54,15 +57,16 @@ module PhusionPassenger
     private
       def self.create_option_parser(options)
         OptionParser.new do |opts|
+          defaults = CONFIG_DEFAULTS
           nl = "\n" + ' ' * 37
-          opts.banner = "Usage: passenger stop [OPTIONS]\n"
+          opts.banner = "Usage: passenger stop [OPTIONS] [APP DIR]\n"
           opts.separator "Stops a running #{PROGRAM_NAME} Standalone instance."
           opts.separator ""
 
           opts.separator "Options:"
           opts.on("-p", "--port NUMBER", Integer,
             "The port number of the #{PROGRAM_NAME}#{nl}" +
-            "instance. Default: 3000") do |value|
+            "instance. Default: #{defaults[:port]}") do |value|
             options[:port] = value
           end
           opts.on("--pid-file FILE", String,
@@ -77,26 +81,33 @@ module PhusionPassenger
         end
       end
 
-      def find_pid_file
-        return if @options[:pid_file]
+      def load_local_config_file
+        @local_options = ConfigUtils.
+          load_local_config_file_from_app_dir_param!(@argv)
+      end
 
-        logical_pwd = Dir.logical_pwd
+      def load_env_config
+        @env_options = ConfigUtils.load_env_config!
+      end
 
-        ["tmp/pids", "."].each do |dir|
-          path = File.absolute_logical_path(
-            "#{dir}/passenger.#{@options[:port]}.pid",
-            logical_pwd)
-          if File.exist?(path)
-            @options[:pid_file] = path
-            return
-          end
-        end
+      def remerge_all_options
+        @options = ConfigUtils.remerge_all_config(@global_options,
+          @local_options, @env_options, @parsed_options)
+      end
 
-        if @options[:ignore_pid_not_found]
-          exit
-        else
-          Standalone::ControlUtils.warn_pid_file_not_found(@options)
-          exit 1
+      def execution_root
+        @argv[0] || Dir.logical_pwd
+      end
+
+      def find_pid_file
+        ConfigUtils.find_pid_and_log_file(execution_root, @options)
+        if !@options[:pid_file]
+          if @options[:ignore_pid_not_found]
+            exit
+          else
+            Standalone::ControlUtils.warn_pid_file_not_found(@options)
+            exit 1
+          end
         end
       end