passenger 5.0.0.beta3 → 5.0.0.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,20 +24,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: daemon_controller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -2750,6 +2736,7 @@ files:
 - ext/ruby/extconf.rb
 - ext/ruby/passenger_native_support.c
 - helper-scripts/backtrace-sanitizer.rb
+- helper-scripts/crash-watch.rb
 - helper-scripts/download_binaries/extconf.rb
 - helper-scripts/meteor-loader.rb
 - helper-scripts/node-loader.js
@@ -2826,11 +2813,9 @@ files:
 - lib/phusion_passenger/simple_benchmarking.rb
 - lib/phusion_passenger/standalone/app_finder.rb
 - lib/phusion_passenger/standalone/command.rb
-- lib/phusion_passenger/standalone/command2.rb
 - lib/phusion_passenger/standalone/config_utils.rb
 - lib/phusion_passenger/standalone/control_utils.rb
 - lib/phusion_passenger/standalone/main.rb
-- lib/phusion_passenger/standalone/start2_command.rb
 - lib/phusion_passenger/standalone/start_command.rb
 - lib/phusion_passenger/standalone/start_command/builtin_engine.rb
 - lib/phusion_passenger/standalone/start_command/nginx_engine.rb
@@ -2854,6 +2839,13 @@ files:
 - lib/phusion_passenger/utils/terminal_choice_menu.rb
 - lib/phusion_passenger/utils/tmpio.rb
 - lib/phusion_passenger/utils/unseekable_socket.rb
+- lib/phusion_passenger/vendor/crash_watch/app.rb
+- lib/phusion_passenger/vendor/crash_watch/gdb_controller.rb
+- lib/phusion_passenger/vendor/crash_watch/version.rb
+- lib/phusion_passenger/vendor/daemon_controller.rb
+- lib/phusion_passenger/vendor/daemon_controller/lock_file.rb
+- lib/phusion_passenger/vendor/daemon_controller/spawn.rb
+- lib/phusion_passenger/vendor/daemon_controller/version.rb
 - man/passenger-config.1
 - man/passenger-memory-stats.8
 - man/passenger-status.8
@@ -2937,6 +2929,7 @@ files:
 - resources/templates/config/installation_utils/support_binaries_dir_not_writable_despite_running_as_root.txt.erb
 - resources/templates/config/installation_utils/unexpected_filesystem_problem.txt.erb
 - resources/templates/config/installation_utils/user_support_binaries_dir_not_writable.txt.erb
+- resources/templates/config/nginx_engine_compiler/possible_solutions_for_download_and_extraction_problems.txt.erb
 - resources/templates/error_layout.css
 - resources/templates/error_layout.html.template
 - resources/templates/general_error.html.template
@@ -2963,9 +2956,6 @@ files:
 - resources/templates/nginx/welcome.txt.erb
 - resources/templates/standalone/cannot_write_to_dir.txt.erb
 - resources/templates/standalone/config.erb
-- resources/templates/standalone/download_tool_missing.txt.erb
-- resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb
-- resources/templates/standalone/run_installer_as_root.txt.erb
 - resources/templates/undisclosed_error.html.template
 - resources/union_station_gateway.crt
 - test/.rspec

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU2MfwAAoJECrHRaUKISqMPmYIAKtrMbpRJ2DHxagF3AnOV7xM
-LzLmXQ8mTHZdd1fL2DJmWHISF0y9FQKseLrStQbq9G/tPTaAzNEwF9Z/Jc952Z7n
-7rx/FGkwzAJdqlgVWsMC18CvZY5UHirzvvMnkCG146X6w/sybWA3FhKy13pkUZh9
-9CKT1RVlDR+jciUKOsE6AZXdLHv6Dsy/9Egy9fgqQbJV9NAMgO7dQ8xBx2GJgUX1
-QKiGxMX5thOkNTLlZ+Xjw7t5RyR778Jka+UN2pfNaRy749Z9wWoImZpgKRAQEwF4
-lgp7UNO8eMwgCE0cagIAcpVwSxVuI139ux8rk4E0zmHOKIUpqUtOWI3dB1oPsAw=
-=YYe9
+iQEcBAABAgAGBQJU5fgMAAoJECrHRaUKISqM2W8IAIiE6ZNzN5Z8ZOJl04ujPwph
+HsyNPbuc/hokEeFf2rxsNM9T6JgsihckDMWHInNpEGx1xM+5sMNJ8Qka4RW4SImA
+Neb9Q8LIMI5onbNut1u4r8NZAd6D+LJEwyvMoKW5BLtVTLM4nDcN9ck+FLXG+Hi4
+/gclwWQixnxeMyi209hJpQrd6xzXmbj7yhsh3IruunnZYnMEVtyutZuLyTBPTg8g
+5JyukZ4M7z0MyQRmSDWm0BsVUjjDwz1PWyfoYn8rfTGCbKF5DioKQlKkT1RI46EL
+gpJzP4IzyZTSOmbBH47LWudsDG2sYETcKQHluxX5fHgP9d/RRUJYGFWOrwhT9zI=
+=VpfF
 -----END PGP SIGNATURE-----

data/lib/phusion_passenger/standalone/command2.rb

@@ -1,292 +0,0 @@
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
-#
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-require 'optparse'
-PhusionPassenger.require_passenger_lib 'constants'
-PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-PhusionPassenger.require_passenger_lib 'utils'
-PhusionPassenger.require_passenger_lib 'standalone/utils'
-
-module PhusionPassenger
-module Standalone
-
-class Command
-	DEFAULT_OPTIONS = {
-		:address       => '0.0.0.0',
-		:port          => 3000,
-		:environment   => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || ENV['NODE_ENV'] || ENV['PASSENGER_APP_ENV'] || 'development',
-		:max_pool_size => 6,
-		:min_instances => 1,
-		:spawn_method  => Kernel.respond_to?(:fork) ? 'smart' : 'direct',
-		:concurrency_model => DEFAULT_CONCURRENCY_MODEL,
-		:thread_count  => DEFAULT_THREAD_COUNT,
-		:nginx_version => PREFERRED_NGINX_VERSION
-	}.freeze
-
-	include Utils
-
-	def self.show_in_command_list
-		return true
-	end
-
-	def self.description
-		return nil
-	end
-
-	def initialize(args)
-		@args = args.dup
-		@original_args = args.dup
-		@options = DEFAULT_OPTIONS.dup
-	end
-
-private
-	def require_daemon_controller
-		if !defined?(DaemonController)
-			begin
-				require 'daemon_controller'
-				begin
-					require 'daemon_controller/version'
-					too_old = DaemonController::VERSION_STRING < '1.1.0'
-				rescue LoadError
-					too_old = true
-				end
-				if too_old
-					PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-					gem_command = PlatformInfo.gem_command(:sudo => true)
-					error "Your version of daemon_controller is too old. " <<
-					      "You must install 1.1.0 or later. Please upgrade:\n\n" <<
-
-					      " #{gem_command} uninstall FooBarWidget-daemon_controller\n" <<
-					      " #{gem_command} install daemon_controller",
-					      :wrap => false
-					exit 1
-				end
-			rescue LoadError
-				PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-				gem_command = PlatformInfo.gem_command(:sudo => true)
-				error "Please install daemon_controller first:\n\n" <<
-				      " #{gem_command} install daemon_controller"
-				exit 1
-			end
-		end
-	end
-
-	def require_erb
-		require 'erb' unless defined?(ERB)
-	end
-
-	def require_etc
-		require 'etc' unless defined?(Etc)
-	end
-
-	def require_optparse
-		require 'optparse' unless defined?(OptionParser)
-	end
-
-	def require_app_finder
-		PhusionPassenger.require_passenger_lib 'standalone/app_finder' unless defined?(AppFinder)
-	end
-
-	def debugging?
-		return ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
-	end
-
-	def parse_options!(command_name, description = nil)
-		require_etc
-		help = false
-
-		home_dir = PhusionPassenger.home_dir
-		global_config_file = File.join(home_dir, USER_NAMESPACE_DIRNAME, "standalone", "config")
-		if File.exist?(global_config_file)
-			PhusionPassenger.require_passenger_lib 'standalone/config_file' unless defined?(ConfigFile)
-			global_options = ConfigFile.new(:global_config, global_config_file).options
-			@options.merge!(global_options)
-		end
-
-		require_optparse
-		parser = OptionParser.new do |opts|
-			opts.banner = "Usage: passenger #{command_name} [options]"
-			opts.separator description if description
-			opts.separator " "
-			yield opts
-			opts.on("-h", "--help", "Show this help message") do
-				help = true
-			end
-		end
-		parser.parse!(@args)
-		if help
-			puts parser
-			exit 0
-		end
-	end
-
-	def error(message, options = {})
-		wrap = options.fetch(:wrap, true)
-		if message =~ /\n/
-			if wrap
-				processed_message = wrap_desc(message, 80, 0)
-			else
-				processed_message = message
-			end
-			STDERR.puts("*** ERROR ***\n" << processed_message)
-		else
-			if wrap
-				processed_message = wrap_desc("*** ERROR: #{message}", 80, 0)
-			else
-				processed_message = "*** ERROR: #{message}"
-			end
-			STDERR.puts(processed_message)
-		end
-		@plugin.call_hook(:error, message) if @plugin
-	end
-
-	# Word wrap the given option description text so that it is formatted
-	# nicely in the --help output.
-	def wrap_desc(description_text, max_width = 43, newline_prefix_size = 37)
-		line_prefix = "\n" << (' ' * newline_prefix_size)
-		result = description_text.gsub(/(.{1,#{max_width}})( +|$\n?)|(.{1,#{max_width}})/, "\\1\\3#{line_prefix}")
-		result.strip!
-		return result
-	end
-
-	def ensure_directory_exists(dir)
-		if !File.exist?(dir)
-			require_file_utils
-			FileUtils.mkdir_p(dir)
-		end
-	end
-
-	def determine_various_resource_locations(create_subdirs = true)
-		require_app_finder
-		if @options[:socket_file]
-			pid_basename = "passenger.pid"
-			log_basename = "passenger.log"
-		else
-			pid_basename = "passenger.#{@options[:port]}.pid"
-			log_basename = "passenger.#{@options[:port]}.log"
-		end
-		if @args.empty?
-			if AppFinder.looks_like_app_directory?(".")
-				@options[:pid_file] ||= File.absolute_path_no_resolve("tmp/pids/#{pid_basename}")
-				@options[:log_file] ||= File.absolute_path_no_resolve("log/#{log_basename}")
-				if create_subdirs
-					ensure_directory_exists(File.dirname(@options[:pid_file]))
-					ensure_directory_exists(File.dirname(@options[:log_file]))
-				end
-			else
-				@options[:pid_file] ||= File.absolute_path_no_resolve(pid_basename)
-				@options[:log_file] ||= File.absolute_path_no_resolve(log_basename)
-			end
-		else
-			@options[:pid_file] ||= File.absolute_path_no_resolve(File.join(@args[0], pid_basename))
-			@options[:log_file] ||= File.absolute_path_no_resolve(File.join(@args[0], log_basename))
-		end
-	end
-
-	def write_nginx_config_file
-		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-		PhusionPassenger.require_passenger_lib 'utils/tmpio'
-		# @temp_dir may already be set because we're redeploying
-		# using Mass Deployment.
-		@temp_dir ||= PhusionPassenger::Utils.mktmpdir(
-			"passenger-standalone.")
-		@config_filename = "#{@temp_dir}/config"
-		File.chmod(0755, @temp_dir)
-		begin
-			Dir.mkdir("#{@temp_dir}/logs")
-		rescue Errno::EEXIST
-		end
-
-		File.open(@config_filename, 'w') do |f|
-			f.chmod(0644)
-			require_erb
-			erb = ERB.new(File.read(nginx_config_template_filename), nil, "-")
-			current_user = Etc.getpwuid(Process.uid).name
-
-			# The template requires some helper methods which are defined in start_command.rb.
-			output = erb.result(binding)
-			f.write(output)
-			puts output if debugging?
-		end
-	end
-
-	def nginx_config_template_filename
-		if @options[:nginx_config_template]
-			return @options[:nginx_config_template]
-		else
-			return File.join(PhusionPassenger.resources_dir,
-				"templates", "standalone", "config.erb")
-		end
-	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') }
-			null  = "\0".force_encoding('binary')
-		else
-			null  = "\0"
-		end
-		return [items.join(null)].pack('m*').gsub("\n", "").strip
-	end
-
-	def determine_nginx_start_command
-		return "#{@nginx_binary} -c '#{@config_filename}' -p '#{@temp_dir}/'"
-	end
-
-	# Returns the port on which to ping Nginx.
-	def nginx_ping_port
-		if @options[:ping_port]
-			return @options[:ping_port]
-		else
-			return @options[:port]
-		end
-	end
-
-	def create_nginx_controller(extra_options = {})
-		require_daemon_controller
-		require 'socket' unless defined?(UNIXSocket)
-		require 'thread' unless defined?(Mutex)
-		if @options[:socket_file]
-			ping_spec = [:unix, @options[:socket_file]]
-		else
-			ping_spec = [:tcp, @options[:address], nginx_ping_port]
-		end
-		opts = {
-			:identifier    => 'Nginx',
-			:before_start  => method(:write_nginx_config_file),
-			:start_command => method(:determine_nginx_start_command),
-			:ping_command  => ping_spec,
-			:pid_file      => @options[:pid_file],
-			:log_file      => @options[:log_file],
-			:timeout       => 25
-		}
-		@nginx = DaemonController.new(opts.merge(extra_options))
-		@nginx_mutex = Mutex.new
-	end
-end
-
-end # module Standalone
-end # module PhusionPassenger

data/lib/phusion_passenger/standalone/start2_command.rb

@@ -1,799 +0,0 @@
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
-#
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-require 'socket'
-require 'thread'
-require 'etc'
-PhusionPassenger.require_passenger_lib 'constants'
-PhusionPassenger.require_passenger_lib 'plugin'
-PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
-PhusionPassenger.require_passenger_lib 'standalone/command'
-PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
-
-# We lazy load as many libraries as possible not only to improve startup performance,
-# but also to ensure that we don't require libraries before we've passed the dependency
-# checking stage of the runtime installer.
-
-module PhusionPassenger
-module Standalone
-
-class StartCommand < Command
-	def self.description
-		return "Start Phusion Passenger Standalone."
-	end
-
-	def initialize(args)
-		super(args)
-		@console_mutex = Mutex.new
-		@termination_pipe = IO.pipe
-		@threads = []
-		@interruptable_threads = []
-		@plugin = PhusionPassenger::Plugin.new('standalone/start_command', self, @options)
-	end
-
-	def run
-		parse_my_options
-
-		ensure_runtime_installed
-		set_stdout_stderr_binmode
-		exit if @options[:runtime_check_only]
-		require_app_finder
-		@app_finder = AppFinder.new(@args, @options)
-		@apps = @app_finder.scan
-		@options = @app_finder.global_options
-		sanity_check_server_options
-		determine_various_resource_locations
-		@plugin.call_hook(:found_apps, @apps)
-
-		extra_controller_options = {}
-		@plugin.call_hook(:before_creating_nginx_controller, extra_controller_options)
-		create_nginx_controller(extra_controller_options)
-
-		begin
-			start_nginx
-			show_intro_message
-			if @options[:daemonize]
-				if PlatformInfo.ruby_supports_fork?
-					daemonize
-				else
-					daemonize_without_fork
-				end
-			end
-			Thread.abort_on_exception = true
-			@plugin.call_hook(:nginx_started, @nginx)
-			########################
-			########################
-			touch_temp_dir_in_background
-			watch_log_files_in_background if should_watch_logs?
-			wait_until_nginx_has_exited if should_wait_until_nginx_has_exited?
-		rescue Interrupt
-			begin_shutdown
-			stop_threads
-			stop_nginx
-			exit 2
-		rescue SignalException => signal
-			begin_shutdown
-			stop_threads
-			stop_nginx
-			if signal.message == 'SIGINT' || signal.message == 'SIGTERM'
-				exit 2
-			else
-				raise
-			end
-		rescue Exception => e
-			begin_shutdown
-			stop_threads
-			stop_nginx
-			raise
-		ensure
-			begin_shutdown
-			begin
-				stop_threads
-			ensure
-				finalize_shutdown
-			end
-		end
-	ensure
-		@plugin.call_hook(:cleanup)
-	end
-
-private
-	def require_file_utils
-		require 'fileutils' unless defined?(FileUtils)
-	end
-
-	def parse_my_options
-		description = "Starts Phusion Passenger Standalone and serve one or more Ruby web applications."
-		parse_options!("start [directory]", description) do |opts|
-			opts.separator "Server options:"
-			opts.on("-a", "--address HOST", String,
-				wrap_desc("Bind to HOST address (default: #{@options[:address]})")) do |value|
-				@options[:address] = value
-				@options[:tcp_explicitly_given] = true
-			end
-			opts.on("-p", "--port NUMBER", Integer,
-				wrap_desc("Use the given port number (default: #{@options[:port]})")) do |value|
-				@options[:port] = value
-				@options[:tcp_explicitly_given] = true
-			end
-			opts.on("-S", "--socket FILE", String,
-				wrap_desc("Bind to Unix domain socket instead of TCP socket")) do |value|
-				@options[:socket_file] = value
-			end
-			opts.on("--ssl",
-				wrap_desc("Enable SSL support")) do
-				@options[:ssl] = true
-			end
-			opts.on("--ssl-certificate PATH", String,
-				wrap_desc("Specify the SSL certificate path")) do |val|
-				@options[:ssl_certificate] = File.absolute_path_no_resolve(val)
-			end
-			opts.on("--ssl-certificate-key PATH", String,
-				wrap_desc("Specify the SSL key path")) do |val|
-				@options[:ssl_certificate_key] = File.absolute_path_no_resolve(val)
-			end
-			opts.on("--ssl-port PORT", Integer,
-				wrap_desc("Listen for SSL on this port, while listening for HTTP on the normal port")) do |val|
-				@options[:ssl_port] = val
-			end
-			opts.on("-d", "--daemonize",
-				wrap_desc("Daemonize into the background")) do
-				@options[:daemonize] = true
-			end
-			opts.on("--user USERNAME", String,
-				wrap_desc("User to run as. Ignored unless running as root.")) do |value|
-				@options[:user] = value
-			end
-			opts.on("--log-file FILENAME", String,
-				wrap_desc("Where to write log messages (default: console, or /dev/null when daemonized)")) do |value|
-				@options[:log_file] = value
-			end
-			opts.on("--pid-file FILENAME", String,
-				wrap_desc("Where to store the PID file")) do |value|
-				@options[:pid_file] = value
-			end
-			opts.on("--instance-registry-dir PATH", String,
-				wrap_desc("Use the given instance registry directory")) do |value|
-				@options[:instance_registry_dir] = value
-			end
-			opts.on("--data-buffer-dir PATH", String,
-				wrap_desc("Use the given data buffer directory")) do |value|
-				@options[:data_buffer_dir] = value
-			end
-
-			opts.separator ""
-			opts.separator "Application loading options:"
-			opts.on("-e", "--environment ENV", String,
-				wrap_desc("Framework environment (default: #{@options[:environment]})")) do |value|
-				@options[:environment] = value
-			end
-			opts.on("-R", "--rackup FILE", String,
-				wrap_desc("Consider application a Ruby Rack app, and use the given rackup file")) do |value|
-				@options[:app_type] = "rack"
-				@options[:startup_file] = value
-			end
-			opts.on("--app-type NAME", String,
-				wrap_desc("Force app to be detected as the given type")) do |value|
-				@options[:app_type] = value
-			end
-			opts.on("--startup-file FILENAME", String,
-				wrap_desc("Force given startup file to be used")) do |value|
-				@options[:startup_file] = value
-			end
-			opts.on("--spawn-method NAME", String,
-				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
-				@options[:spawn_method] = value
-			end
-			opts.on("--static-files-dir PATH", String,
-				wrap_desc("Specify the static files dir")) do |val|
-				@options[:static_files_dir] = File.absolute_path_no_resolve(val)
-			end
-			opts.on("--restart-dir PATH", String,
-				wrap_desc("Specify the restart dir")) do |val|
-				@options[:restart_dir] = File.absolute_path_no_resolve(val)
-			end
-			opts.on("--friendly-error-pages",
-				wrap_desc("Turn on friendly error pages")) do
-				@options[:friendly_error_pages] = true
-			end
-			opts.on("--no-friendly-error-pages",
-				wrap_desc("Turn off friendly error pages")) do
-				@options[:friendly_error_pages] = false
-			end
-			opts.on("--load-shell-envvars",
-				wrap_desc("Load shell startup files before loading application")) do
-				@options[:load_shell_envvars] = true
-			end
-
-			opts.separator ""
-			opts.separator "Process management options:"
-			opts.on("--max-pool-size NUMBER", Integer,
-				wrap_desc("Maximum number of application processes (default: #{@options[:max_pool_size]})")) do |value|
-				@options[:max_pool_size] = value
-			end
-			opts.on("--min-instances NUMBER", Integer,
-				wrap_desc("Minimum number of processes per application (default: #{@options[:min_instances]})")) do |value|
-				@options[:min_instances] = value
-			end
-			opts.on("--concurrency-model NAME", String,
-				wrap_desc("The concurrency model to use, either 'process' or 'thread' (default: #{@options[:concurrency_model]}) (Enterprise only)")) do |value|
-				@options[:concurrency_model] = value
-			end
-			opts.on("--thread-count NAME", Integer,
-				wrap_desc("The number of threads to use when using the 'thread' concurrency model (default: #{@options[:thread_count]}) (Enterprise only)")) do |value|
-				@options[:thread_count] = value
-			end
-			opts.on("--rolling-restarts",
-				wrap_desc("Enable rolling restarts (Enterprise only)")) do
-				@options[:rolling_restarts] = true
-			end
-			opts.on("--resist-deployment-errors",
-				wrap_desc("Enable deployment error resistance (Enterprise only)")) do
-				@options[:resist_deployment_errors] = true
-			end
-
-			opts.separator ""
-			opts.separator "Request handling options:"
-			opts.on("--sticky-sessions",
-				wrap_desc("Enable sticky sessions")) do
-				@options[:sticky_sessions] = true
-			end
-			opts.on("--sticky-sessions-cookie-name", String,
-				wrap_desc("Cookie name to use for sticky sessions (default: #{DEFAULT_STICKY_SESSIONS_COOKIE_NAME})")) do |val|
-				@options[:sticky_sessions_cookie_name] = val
-			end
-
-			opts.separator ""
-			opts.separator "Union Station options:"
-			opts.on("--union-station-gateway HOST:PORT", String,
-				wrap_desc("Specify Union Station Gateway host and port")) do |value|
-				host, port = value.split(":", 2)
-				port = port.to_i
-				port = 443 if port == 0
-				@options[:union_station_gateway_address] = host
-				@options[:union_station_gateway_port] = port.to_i
-			end
-			opts.on("--union-station-key KEY", String,
-				wrap_desc("Specify Union Station key")) do |value|
-				@options[:union_station_key] = value
-			end
-
-			opts.separator ""
-			opts.separator "Advanced options:"
-			opts.on("--ping-port NUMBER", Integer,
-				wrap_desc("Use the given port number for checking whether Nginx is alive (default: same as the normal port)")) do |value|
-				@options[:ping_port] = value
-			end
-			opts.on("--nginx-bin FILENAME", String,
-				wrap_desc("Nginx binary to use as core")) do |value|
-				@options[:nginx_bin] = value
-			end
-			opts.on("--nginx-version VERSION", String,
-				wrap_desc("Nginx version to use as core (default: #{@options[:nginx_version]})")) do |value|
-				@options[:nginx_version] = value
-			end
-			opts.on("--nginx-tarball FILENAME", String,
-				wrap_desc("If Nginx needs to be installed, then the given tarball will " +
-				          "be used instead of downloading from the Internet")) do |value|
-				@options[:nginx_tarball] = File.absolute_path_no_resolve(value)
-			end
-			opts.on("--nginx-config-template FILENAME", String,
-				wrap_desc("The template to use for generating the Nginx config file")) do |value|
-				@options[:nginx_config_template] = File.absolute_path_no_resolve(value)
-			end
-			opts.on("--binaries-url-root URL", String,
-				wrap_desc("If Nginx needs to be installed, then the specified URL will be " +
-				          "checked for binaries prior to a local build.")) do |value|
-				@options[:binaries_url_root] = value
-			end
-			opts.on("--no-download-binaries",
-				wrap_desc("Never download binaries")) do
-				@options[:download_binaries] = false
-			end
-			opts.on("--runtime-check-only",
-				wrap_desc("Quit after checking whether the Phusion Passenger Standalone runtime files are installed")) do
-				@options[:runtime_check_only] = true
-			end
-			opts.on("--no-install-runtime",
-				wrap_desc("Abort if runtime must be installed")) do
-				@options[:dont_install_runtime] = true
-			end
-			opts.on("--no-compile-runtime",
-				wrap_desc("Abort if runtime must be compiled")) do
-				@options[:dont_compile_runtime] = true
-			end
-
-			@plugin.call_hook(:parse_options, opts)
-			opts.separator ""
-		end
-		@plugin.call_hook(:done_parsing_options)
-	end
-
-	def sanity_check_server_options
-		if @options[:tcp_explicitly_given] && @options[:socket_file]
-			error "You cannot specify both --address/--port and --socket. Please choose either one."
-			exit 1
-		end
-		if @options[:ssl] && !@options[:ssl_certificate]
-			error "You specified --ssl. Please specify --ssl-certificate as well."
-			exit 1
-		end
-		if @options[:ssl] && !@options[:ssl_certificate_key]
-			error "You specified --ssl. Please specify --ssl-certificate-key as well."
-			exit 1
-		end
-		check_port_bind_permission_and_display_sudo_suggestion
-		check_port_availability
-	end
-
-	# Most platforms don't allow non-root processes to bind to a port lower than 1024.
-	# Check whether this is the case for the current platform and if so, tell the user
-	# that it must re-run Phusion Passenger Standalone with sudo.
-	def check_port_bind_permission_and_display_sudo_suggestion
-		if !@options[:socket_file] && @options[:port] < 1024 && Process.euid != 0
-			begin
-				TCPServer.new('127.0.0.1', @options[:port]).close
-			rescue Errno::EACCES
-				PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-				myself = `whoami`.strip
-				error "Only the 'root' user can run this program on port #{@options[:port]}. " <<
-				      "You are currently running as '#{myself}'. Please re-run this program " <<
-				      "with root privileges with the following command:\n\n" <<
-
-				      "  #{PlatformInfo.ruby_sudo_command} passenger start #{@original_args.join(' ')} --user=#{myself}\n\n" <<
-
-				      "Don't forget the '--user' part! That will make Phusion Passenger Standalone " <<
-				      "drop root privileges and switch to '#{myself}' after it has obtained " <<
-				      "port #{@options[:port]}."
-				exit 1
-			end
-		end
-	end
-
-	if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-		require 'java'
-
-		def check_port(host_name, port)
-			channel = java.nio.channels.SocketChannel.open
-			begin
-				address = java.net.InetSocketAddress.new(host_name, port)
-				channel.configure_blocking(false)
-				if channel.connect(address)
-					return true
-				end
-
-				deadline = Time.now.to_f + 0.1
-				done = false
-				while true
-					begin
-						if channel.finish_connect
-							return true
-						end
-					rescue java.net.ConnectException => e
-						if e.message =~ /Connection refused/i
-							return false
-						else
-							throw e
-						end
-					end
-
-					# Not done connecting and no error.
-					sleep 0.01
-					if Time.now.to_f >= deadline
-						return false
-					end
-				end
-			ensure
-				channel.close
-			end
-		end
-	else
-		def check_port_with_protocol(address, port, protocol)
-			begin
-				socket = Socket.new(protocol, Socket::Constants::SOCK_STREAM, 0)
-				sockaddr = Socket.pack_sockaddr_in(port, address)
-				begin
-					socket.connect_nonblock(sockaddr)
-				rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
-					if select(nil, [socket], nil, 0.1)
-						begin
-							socket.connect_nonblock(sockaddr)
-						rescue Errno::EISCONN
-						rescue Errno::EINVAL
-							if PlatformInfo.os_name =~ /freebsd/i
-								raise Errno::ECONNREFUSED
-							else
-								raise
-							end
-						end
-					else
-						raise Errno::ECONNREFUSED
-					end
-				end
-				return true
-			rescue Errno::ECONNREFUSED
-				return false
-			ensure
-				socket.close if socket && !socket.closed?
-			end
-		end
-
-		def check_port(address, port)
-			begin
-				check_port_with_protocol(address, port, Socket::Constants::AF_INET)
-			rescue Errno::EAFNOSUPPORT
-				check_port_with_protocol(address, port, Socket::Constants::AF_INET6)
-			end
-		end
-	end
-
-	def check_port_availability
-		if !@options[:socket_file] && check_port(@options[:address], @options[:port])
-			error "The address #{@options[:address]}:#{@options[:port]} is already " <<
-			      "in use by another process, perhaps another Phusion Passenger " <<
-			      "Standalone instance.\n\n" <<
-			      "If you want to run this Phusion Passenger Standalone instance on " <<
-			      "another port, use the -p option, like this:\n\n" <<
-			      "  passenger start -p #{@options[:port] + 1}"
-			exit 1
-		end
-	end
-
-	def should_watch_logs?
-		return !@options[:daemonize] && @options[:log_file] != "/dev/null"
-	end
-
-	def should_wait_until_nginx_has_exited?
-		return !@options[:daemonize] || @app_finder.multi_mode?
-	end
-
-	# Returns the URL that Nginx will be listening on.
-	def listen_url
-		if @options[:socket_file]
-			return @options[:socket_file]
-		else
-			if @options[:ssl] && !@options[:ssl_port]
-				scheme = "https"
-			else
-				scheme = "http"
-			end
-			result = "#{scheme}://"
-			if @options[:port] == 80
-				result << @options[:address]
-			else
-				result << compose_ip_and_port(@options[:address], @options[:port])
-			end
-			result << "/"
-			return result
-		end
-	end
-
-	def ensure_runtime_installed
-		@agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
-		if @options[:nginx_bin]
-			@nginx_binary = @options[:nginx_bin]
-			if !@nginx_binary
-				abort "Error: Nginx binary #{@options[:nginx_bin]} does not exist"
-			end
-			if !@agent_exe
-				install_runtime
-				@agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
-			end
-		else
-			nginx_name = "nginx-#{@options[:nginx_version]}"
-			@nginx_binary = PhusionPassenger.find_support_binary(nginx_name)
-			if !@agent_exe || !@nginx_binary
-				install_runtime
-				@agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
-				@nginx_binary = PhusionPassenger.find_support_binary(nginx_name)
-			end
-		end
-	end
-
-	def install_runtime
-		if @options[:dont_install_runtime]
-			STDERR.puts "*** ERROR: Refusing to install the #{PROGRAM_NAME} Standalone runtime " +
-				"because --no-install-runtime is given."
-			abort
-		end
-
-		args = ["--brief", "--no-force-tip"]
-		if @options[:binaries_url_root]
-			args << "--url-root"
-			args << @options[:binaries_url_root]
-		end
-		if @options[:nginx_version]
-			args << "--nginx-version"
-			args << @options[:nginx_version]
-		end
-		if @options[:nginx_tarball]
-			args << "--nginx-tarball"
-			args << @options[:nginx_tarball]
-		end
-		if @options[:dont_compile_runtime]
-			args << "--no-compile"
-		end
-		PhusionPassenger.require_passenger_lib 'config/install_standalone_runtime_command'
-		PhusionPassenger::Config::InstallStandaloneRuntimeCommand.new(args).run
-		puts
-		puts "--------------------------"
-		puts
-	end
-
-	def set_stdout_stderr_binmode
-		# We already set STDOUT and STDERR to binmode in bin/passenger, which
-		# fixes https://github.com/phusion/passenger-ruby-heroku-demo/issues/11.
-		# However RuntimeInstaller sets them to UTF-8, so here we set them back.
-		STDOUT.binmode
-		STDERR.binmode
-	end
-
-	def start_nginx
-		begin
-			@nginx.start
-		rescue DaemonController::AlreadyStarted
-			begin
-				pid = @nginx.pid
-			rescue SystemCallError, IOError
-				pid = nil
-			end
-			if pid
-				error "Phusion Passenger Standalone is already running on PID #{pid}."
-			else
-				error "Phusion Passenger Standalone is already running."
-			end
-			exit 1
-		rescue DaemonController::StartError => e
-			error "Could not start Passenger Nginx core:\n#{e}"
-			exit 1
-		end
-	end
-
-	def show_intro_message
-		puts "=============== Phusion Passenger Standalone web server started ==============="
-		puts "PID file: #{@options[:pid_file]}"
-		puts "Log file: #{@options[:log_file]}"
-		puts "Environment: #{@options[:environment]}"
-		puts "Accessible via: #{listen_url}"
-
-		puts
-		if @options[:daemonize]
-			puts "Serving in the background as a daemon."
-		else
-			puts "You can stop Phusion Passenger Standalone by pressing Ctrl-C."
-		end
-		puts "Problems? Check #{STANDALONE_DOC_URL}#troubleshooting"
-		puts "==============================================================================="
-	end
-
-	def daemonize_without_fork
-		STDERR.puts "Unable to daemonize using the current Ruby interpreter " +
-			"(#{PlatformInfo.ruby_command}) because it does not support forking."
-		exit 1
-	end
-
-	def daemonize
-		pid = fork
-		if pid
-			# Parent
-			exit!(0)
-		else
-			# Child
-			trap "HUP", "IGNORE"
-			STDIN.reopen("/dev/null", "r")
-			STDOUT.reopen(@options[:log_file], "a")
-			STDERR.reopen(@options[:log_file], "a")
-			STDOUT.sync = true
-			STDERR.sync = true
-			Process.setsid
-		end
-	end
-
-	# Wait until the termination pipe becomes readable (a hint for threads
-	# to shut down), or until the timeout has been reached. Returns true if
-	# the termination pipe became readable, false if the timeout has been reached.
-	def wait_on_termination_pipe(timeout)
-		ios = select([@termination_pipe[0]], nil, nil, timeout)
-		return !ios.nil?
-	end
-
-	def watch_log_file(log_file)
-		if File.exist?(log_file)
-			backward = 0
-		else
-			# tail bails out if the file doesn't exist, so wait until it exists.
-			while !File.exist?(log_file)
-				sleep 1
-			end
-			backward = 10
-		end
-
-		IO.popen("tail -f -n #{backward} \"#{log_file}\"", "rb") do |f|
-			begin
-				while true
-					begin
-						line = f.readline
-						@console_mutex.synchronize do
-							STDOUT.write(line)
-							STDOUT.flush
-						end
-					rescue EOFError
-						break
-					end
-				end
-			ensure
-				Process.kill('TERM', f.pid) rescue nil
-			end
-		end
-	end
-
-	def watch_log_files_in_background
-		@apps.each do |app|
-			thread = Thread.new do
-				watch_log_file("#{app[:root]}/log/#{@options[:environment]}.log")
-			end
-			@threads << thread
-			@interruptable_threads << thread
-		end
-		thread = Thread.new do
-			watch_log_file(@options[:log_file])
-		end
-		@threads << thread
-		@interruptable_threads << thread
-	end
-
-	def touch_temp_dir_in_background
-		result = system(@agent_exe,
-			"temp-dir-toucher",
-			@temp_dir,
-			"--cleanup",
-			"--daemonize",
-			"--pid-file", "#{@temp_dir}/temp_dir_toucher.pid",
-			"--log-file", @options[:log_file])
-		if !result
-			error "Cannot start #{@agent_exe} temp-dir-toucher"
-			exit 1
-		end
-	end
-
-	def begin_shutdown
-		return if @shutting_down
-		@shutting_down = 1
-		trap("INT", &method(:signal_during_shutdown))
-		trap("TERM", &method(:signal_during_shutdown))
-	end
-
-	def finalize_shutdown
-		@shutting_down = nil
-		trap("INT", "DEFAULT")
-		trap("TERM", "DEFAULT")
-	end
-
-	def signal_during_shutdown(signal)
-		if @shutting_down == 1
-			@shutting_down += 1
-			puts "Ignoring signal #{signal} during shutdown. Send it again to force exit."
-		else
-			exit!(1)
-		end
-	end
-
-	def stop_touching_temp_dir_in_background
-		if @toucher
-			begin
-				Process.kill('TERM', @toucher.pid)
-			rescue Errno::ESRCH, Errno::ECHILD
-			end
-			@toucher.close
-		end
-	end
-
-	def wait_until_nginx_has_exited
-		# Since Nginx is not our child process (it daemonizes or we daemonize)
-		# we cannot use Process.waitpid to wait for it. A busy-sleep-loop with
-		# Process.kill(0, pid) isn't very efficient. Instead we do this:
-		#
-		# Connect to Nginx and wait until Nginx disconnects the socket because of
-		# timeout. Keep doing this until we can no longer connect.
-		while true
-			if @options[:socket_file]
-				socket = UNIXSocket.new(@options[:socket_file])
-			else
-				socket = TCPSocket.new(@options[:address], nginx_ping_port)
-			end
-			begin
-				socket.read rescue nil
-			ensure
-				socket.close rescue nil
-			end
-		end
-	rescue Errno::ECONNREFUSED, Errno::ECONNRESET
-	end
-
-	def stop_nginx
-		@console_mutex.synchronize do
-			STDOUT.write("Stopping web server...")
-			STDOUT.flush
-			@nginx.stop
-			STDOUT.puts " done"
-			STDOUT.flush
-		end
-	end
-
-	def stop_threads
-		if !@termination_pipe[1].closed?
-			@termination_pipe[1].write("x")
-			@termination_pipe[1].close
-		end
-		@interruptable_threads.each do |thread|
-			thread.terminate
-		end
-		@interruptable_threads = []
-		@threads.each do |thread|
-			thread.join
-		end
-		@threads = []
-	end
-
-	#### Config file template helpers ####
-
-	def nginx_listen_address(options = @options, for_ping_port = false)
-		if options[:socket_file]
-			return "unix:" + File.absolute_path_no_resolve(options[:socket_file])
-		else
-			if for_ping_port
-				port = options[:ping_port]
-			else
-				port = options[:port]
-			end
-			return compose_ip_and_port(options[:address], port)
-		end
-	end
-
-	def nginx_listen_address_with_ssl_port(options = @options)
-		if options[:socket_file]
-			return "unix:" + File.absolute_path_no_resolve(options[:socket_file])
-		else
-			return compose_ip_and_port(options[:address], options[:ssl_port])
-		end
-	end
-
-	def compose_ip_and_port(ip, port)
-		if ip =~ /:/
-			# IPv6
-			return "[#{ip}]:#{port}"
-		else
-			return "#{ip}:#{port}"
-		end
-	end
-
-	def default_group_for(username)
-		user = Etc.getpwnam(username)
-		group = Etc.getgrgid(user.gid)
-		return group.name
-	end
-
-	#################
-end
-
-end # module Standalone
-end # module PhusionPassenger