passenger 4.0.60 → 5.0.0.beta1

data/bin/passenger-status

@@ -33,115 +33,138 @@ require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 
 PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'platform_info'
-PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'optparse'
+require 'socket'
+require 'net/http'
 
+include PhusionPassenger::SharedConstants
 include PhusionPassenger::AdminTools
 include PhusionPassenger::Utils::AnsiColors
 
-DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty? }.freeze
+DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty?, :header => true }.freeze
 
 
 ##### Show status command #####
 
 def command_show_status(argv, options)
 	if argv.empty?
-		server_instance = find_sole_server_instance
+		instance = find_sole_instance
 	else
-		server_instance = find_server_instance_on_pid(argv[0].to_i)
+		instance = find_instance_by_name_prefix(argv[0])
 	end
-	show_status(server_instance, options)
+	show_status(instance, options)
 end
 
-def find_sole_server_instance
-	server_instances = ServerInstance.list
-	if server_instances.empty?
-		abort "ERROR: Phusion Passenger doesn't seem to be running."
-	elsif server_instances.size == 1
-		return server_instances.first
+def find_sole_instance
+	instances = InstanceRegistry.new.list
+	if instances.empty?
+		abort "ERROR: #{PROGRAM_NAME} doesn't seem to be running. If you " +
+			"are sure that it is running, then the causes of this problem could be:\n\n" +
+			"1. You customized the instance registry directory using Apache's " +
+			"PassengerInstanceRegistryDir option, Nginx's passenger_instance_registry_dir " +
+			"option, or #{PROGRAM_NAME} Standalone's --instance-registry-dir command line " +
+			"argument. If so, please set the environment variable PASSENGER_INSTANCE_REGISTRY_DIR " +
+			"to that directory and run passenger-status again.\n" +
+			"2. The instance directory has been removed by an operating system background service. " +
+			"Please set a different instance registry directory using Apache's " +
+			"PassengerInstanceRegistryDir option, Nginx's passenger_instance_registry_dir " +
+			"option, or #{PROGRAM_NAME} Standalone's --instance-registry-dir command line " +
+			"argument."
+	elsif instances.size == 1
+		return instances.first
 	else
-		puts "It appears that multiple Passenger instances are running. Please select a"
-		puts "specific one by running:"
+		puts "It appears that multiple #{PROGRAM_NAME} instances are running. Please"
+		puts "select a specific one by running:"
 		puts
-		puts "  passenger-status <PID>"
+		puts "  passenger-status <NAME>"
 		puts
-		puts "The following Passenger instances are running:"
-		server_instances.each do |instance|
-			puts "  PID: #{instance.pid}"
+		puts "The following instances are running:"
+		puts
+		printf "%-25s  %s\n", "Name", "Description"
+		puts "------------------------------------------------------------------"
+		instances.each do |instance|
+			printf "%-25s  %s\n", instance.name, instance.server_software
 		end
 		exit 1
 	end
 end
 
-def find_server_instance_on_pid(pid)
-	if server_instance = ServerInstance.for_pid(pid)
-		return server_instance
+def find_instance_by_name_prefix(name)
+	instance = InstanceRegistry.new.find_by_name_prefix(name)
+	if instance == :ambigious
+		abort "ERROR: there are multiple instances whose name start with '#{name}'. Please specify the full name."
+	elsif instance
+		return instance
 	else
-		abort "ERROR: there doesn't seem to be a Phusion Passenger instance running on PID #{pid}."
+		abort "ERROR: there doesn't seem to be a #{PROGRAM_NAME} instance running with the name '#{name}'."
 	end
 end
 
-def show_status(server_instance, options)
-	if options[:show] != 'xml'
-		puts "Version : #{PhusionPassenger::VERSION_STRING}"
-		puts "Date    : #{Time.now}"
-		puts "Instance: #{server_instance.pid}"
-	end
+def show_status(instance, options)
+	print_header(STDOUT, instance) if options[:header]
+
 	case options[:show]
 	when 'pool'
-		client = server_instance.connect(:role => :passenger_status)
-		begin
-			puts client.pool_status(:verbose => options[:verbose], :colorize => options[:color])
-		rescue SystemCallError => e
-			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
-			STDERR.puts e.to_s
+		request = Net::HTTP::Get.new("/pool.txt?colorize=#{options[:color]}&verbose=#{options[:verbose]}")
+		request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
+		response = instance.http_request("agents.s/server_admin", request)
+		if response.code.to_i / 100 == 2
+			puts response.body
+		else
+			STDERR.puts "*** An error occured."
+			STDERR.puts response.body
 			exit 2
 		end
 
-	when 'requests'
-		client = server_instance.connect(:role => :passenger_status)
-		begin
-			puts client.helper_agent_requests
-		rescue SystemCallError => e
-			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
-			STDERR.puts e.to_s
+	when 'requests', 'server'
+		request = Net::HTTP::Get.new("/server.json")
+		request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
+		response = instance.http_request("agents.s/server_admin", request)
+		if response.code.to_i / 100 == 2
+			puts response.body
+		else
+			STDERR.puts "*** An error occured."
+			STDERR.puts response.body
 			exit 2
 		end
 
 	when 'backtraces'
-		client = server_instance.connect(:role => :passenger_status)
-		begin
-			text = client.helper_agent_backtraces
-		rescue SystemCallError => e
-			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{control_process.pid}:"
-			STDERR.puts e.to_s
+		request = Net::HTTP::Get.new("/backtraces.txt")
+		request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
+		response = instance.http_request("agents.s/server_admin", request)
+		if response.code.to_i / 100 == 2
+			text = response.body
+			# Colorize output
+			color = PhusionPassenger::Utils::AnsiColors.new
+			text.gsub!(/^(Thread .*:)$/, color.black_bg + color.yellow + '\1' + color.reset)
+			text.gsub!(/^( +in '.*? )(.*?)\(/, '\1' + color.bold + '\2' + color.reset + '(')
+			puts text
+		else
+			STDERR.puts "*** An error occured."
+			STDERR.puts response.body
 			exit 2
 		end
 	
-		# Colorize output
-		text.gsub!(/^(Thread .*:)$/, BLACK_BG + YELLOW + '\1' + RESET)
-		text.gsub!(/^( +in '.*? )(.*?)\(/, '\1' + BOLD + '\2' + RESET + '(')
-	
-		puts text
-	
 	when 'xml'
-		client = server_instance.connect(:role => :passenger_status)
-		begin
-			xml = client.pool_xml
-		rescue SystemCallError => e
-			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{control_process.pid}:"
-			STDERR.puts e.to_s
-			exit 2
-		end
-		
-		indented = format_with_xmllint(xml)
-		if indented
-			puts indented
+		request = Net::HTTP::Get.new("/pool.xml")
+		request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
+		response = instance.http_request("agents.s/server_admin", request)
+		if response.code.to_i / 100 == 2
+			indented = format_with_xmllint(response.body)
+			if indented
+				puts indented
+			else
+				puts response.body
+				STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
+			end
 		else
-			puts xml
-			STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
+			STDERR.puts "*** An error occured."
+			STDERR.puts response.body
+			exit 2
 		end
 
 	when 'union_station'
@@ -156,23 +179,32 @@ def show_status(server_instance, options)
 
 		puts response
 	end
-rescue ServerInstance::RoleDeniedError
-	PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-	STDERR.puts "*** ERROR: You are not authorized to query the status for this Phusion " <<
-		"Passenger instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
-	exit 2
-rescue ServerInstance::CorruptedDirectoryError
-	STDERR.puts "*** ERROR: The server instance directory #{server_instance.path} is corrupted. " <<
-		"This could have two causes:\n" <<
-		"\n" <<
-		"  1. The Phusion Passenger instance is no longer running, but failed to cleanup the directory. " <<
-			"Please delete this directory and ignore the problem.\n" <<
-		"  2. An external program corrupted the directory. Please restart Phusion Passenger.\n"
-	exit 2
 ensure
 	client.close if client
 end
 
+def print_header(io, instance)
+	io.puts "Version : #{PhusionPassenger::VERSION_STRING}"
+	io.puts "Date    : #{Time.now}"
+	io.puts "Instance: #{instance.name} (#{instance.server_software})"
+	io.puts
+end
+
+def obtain_read_only_admin_password(instance)
+	begin
+		password = instance.read_only_admin_password
+	rescue Errno::EACCES
+		print_permission_error_message
+		exit 2
+	end
+end
+
+def print_permission_error_message
+	PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+	STDERR.puts "*** ERROR: You are not authorized to query the status for this " <<
+		"#{PROGRAM_NAME} instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
+end
+
 def format_with_xmllint(xml)
 	return nil if !PhusionPassenger::PlatformInfo.find_command('xmllint')
 	require 'open3'
@@ -213,24 +245,30 @@ end
 
 def create_option_parser(options)
 	return OptionParser.new do |opts|
-		opts.banner = "Usage: passenger-status [options] [Phusion Passenger's PID]"
+		nl = "\n" << " " * 37
+		opts.banner = "Usage: passenger-status [options] [instance name]"
 		opts.separator ""
 		opts.separator "Tool for inspecting Phusion Passenger's internal status."
 		opts.separator ""
 
 		opts.separator "Options:"
-		opts.on("--show=pool|requests|backtraces|xml|union_station", String,
-		        "Whether to show the pool's contents,\n" <<
-		        "#{' ' * 37}the currently running requests,\n" <<
-		        "#{' ' * 37}the backtraces of all threads or an XML\n" <<
-		        "#{' ' * 37}description of the pool.") do |what|
-			if what !~ /\A(pool|requests|backtraces|xml|union_station)\Z/
+		opts.on("--show=pool|server|backtraces|xml|union_station", String,
+		        "Whether to show the pool's contents,#{nl}" <<
+		        "the currently running requests,#{nl}" <<
+		        "the backtraces of all threads or an XML#{nl}" <<
+		        "description of the pool.") do |what|
+			if what !~ /\A(pool|server|requests|backtraces|xml|union_station)\Z/
 				STDERR.puts "Invalid argument for --show."
 				exit 1
 			else
 				options[:show] = what
 			end
 		end
+		opts.on("--no-header", "Do not display an informative header#{nl}" <<
+		        "containing the timestamp, version number,#{nl}" <<
+		        "etc.") do
+			options[:header] = false
+		end
 		opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
 			options[:color] = true
 		end
@@ -256,7 +294,7 @@ def parse_argv
 end
 
 def infer_command
-	if !ARGV[0] || ARGV[0] =~ /\A[0-9]+\Z/
+	if !ARGV[0] || ARGV[0] !~ /^-/
 		return [:show_status, ARGV.dup]
 	else
 		command_name, *argv = ARGV

data/build/agents.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,131 +21,135 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-watchdog_libs = COMMON_LIBRARY.only(:base, 'AgentsBase.o', 'Utils/Base64.o')
-dependencies = [
-	'ext/common/agents/Watchdog/Main.cpp',
-	'ext/common/agents/Watchdog/AgentWatcher.cpp',
-	'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
-	'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
-	'ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp',
-	'ext/common/Constants.h',
-	'ext/common/ServerInstanceDir.h',
-	'ext/common/ResourceLocator.h',
-	'ext/common/Utils/VariantMap.h',
-	LIBBOOST_OXT,
-	watchdog_libs.link_objects
-].flatten
-file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
-	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	compile_cxx("ext/common/agents/Watchdog/Main.cpp",
-		"-o #{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
-		"#{EXTRA_PRE_CXXFLAGS} " <<
-		"-Iext -Iext/common " <<
-		"#{AGENT_CFLAGS} #{EXTRA_CXXFLAGS}")
-	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-		"#{AGENT_OUTPUT_DIR}PassengerWatchdog.o " <<
-		"#{watchdog_libs.link_objects_as_string} " <<
-		"#{LIBBOOST_OXT} " <<
-		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
-		"#{PlatformInfo.portability_cxx_ldflags} " <<
-		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_CXX_LDFLAGS}")
+AGENT_OBJECTS = {
+	'WatchdogMain.o' => [
+		'ext/common/agents/Watchdog/Main.cpp',
+		'ext/common/agents/Watchdog/Main.cpp',
+		'ext/common/agents/Watchdog/AgentWatcher.cpp',
+		'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
+		'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
+		'ext/common/agents/Watchdog/InstanceDirToucher.cpp',
+		'ext/common/agents/Watchdog/AdminServer.h',
+		'ext/common/agents/HelperAgent/OptionParser.h',
+		'ext/common/agents/LoggingAgent/OptionParser.h',
+		'ext/common/ServerKit/Server.h',
+		'ext/common/ServerKit/HttpServer.h',
+		'ext/common/ServerKit/HttpHeaderParser.h',
+		'ext/common/ServerKit/FileBufferedChannel.h',
+		'ext/common/Constants.h',
+		'ext/common/InstanceDirectory.h',
+		'ext/common/ResourceLocator.h',
+		'ext/common/Utils/VariantMap.h'
+	],
+	'ServerMain.o' => [
+		'ext/common/agents/HelperAgent/Main.cpp',
+		'ext/common/agents/HelperAgent/OptionParser.h',
+		'ext/common/agents/HelperAgent/AdminServer.h',
+		'ext/common/agents/HelperAgent/ResponseCache.h',
+		'ext/common/agents/HelperAgent/RequestHandler.h',
+		'ext/common/agents/HelperAgent/RequestHandler/Client.h',
+		'ext/common/agents/HelperAgent/RequestHandler/AppResponse.h',
+		'ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h',
+		'ext/common/agents/HelperAgent/RequestHandler/Utils.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/BufferBody.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp',
+		'ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp',
+		'ext/common/ServerKit/Server.h',
+		'ext/common/ServerKit/HttpServer.h',
+		'ext/common/ServerKit/HttpHeaderParser.h',
+		'ext/common/ServerKit/AcceptLoadBalancer.h',
+		'ext/common/ServerKit/FileBufferedChannel.h',
+		'ext/common/Constants.h',
+		'ext/common/StaticString.h',
+		'ext/common/Account.h',
+		'ext/common/AccountsDatabase.h',
+		'ext/common/MessageServer.h',
+		'ext/common/FileDescriptor.h',
+		'ext/common/Logging.h',
+		'ext/common/ResourceLocator.h',
+		'ext/common/Utils/ProcessMetricsCollector.h',
+		'ext/common/Utils/SystemMetricsCollector.h',
+		'ext/common/Utils/VariantMap.h'
+	],
+	'LoggingMain.o' => [
+		'ext/common/agents/LoggingAgent/Main.cpp',
+		'ext/common/agents/LoggingAgent/OptionParser.h',
+		'ext/common/agents/LoggingAgent/AdminServer.h',
+		'ext/common/agents/LoggingAgent/LoggingServer.h',
+		'ext/common/agents/LoggingAgent/RemoteSender.h',
+		'ext/common/agents/LoggingAgent/DataStoreId.h',
+		'ext/common/agents/LoggingAgent/FilterSupport.h',
+		'ext/common/ServerKit/Server.h',
+		'ext/common/ServerKit/HttpServer.h',
+		'ext/common/ServerKit/HttpHeaderParser.h',
+		'ext/common/ServerKit/FileBufferedChannel.h',
+		'ext/common/Constants.h',
+		'ext/common/Logging.h',
+		'ext/common/EventedServer.h',
+		'ext/common/EventedClient.h',
+		'ext/common/Utils/VariantMap.h',
+		'ext/common/Utils/BlockingQueue.h'
+	],
+	'SystemMetricsTool.o' => [
+		'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
+		'ext/common/Utils/SystemMetricsCollector.h'
+	],
+	'TempDirToucher.o' => [
+		'ext/common/agents/TempDirToucher/Main.cpp'
+	],
+	'SpawnPreparer.o' => [
+		'ext/common/agents/SpawnPreparer/Main.cpp'
+	]
+}
+
+AGENT_OBJECTS.each_pair do |agent_object, agent_dependencies|
+	full_agent_object = "#{AGENT_OUTPUT_DIR}#{agent_object}"
+	full_agent_object_dir = File.dirname(full_agent_object)
+	file(full_agent_object => agent_dependencies) do
+		sh "mkdir -p #{full_agent_object_dir}" if !File.directory?(full_agent_object_dir)
+		compile_cxx(agent_dependencies[0],
+			"-o #{full_agent_object} " <<
+			"#{EXTRA_PRE_CXXFLAGS} " <<
+			"-Iext -Iext/common " <<
+			"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+			"#{EXTRA_CXXFLAGS}")
+	end
 end
 
-helper_agent_libs = COMMON_LIBRARY.
-	only(:base, :other).
+agent_libs = COMMON_LIBRARY.
+	only(:base, :logging_agent, :other).
 	exclude('AgentsStarter.o')
-dependencies = [
-	'ext/common/agents/HelperAgent/Main.cpp',
-	'ext/common/agents/HelperAgent/RequestHandler.h',
-	'ext/common/agents/HelperAgent/RequestHandler.cpp',
-	'ext/common/agents/HelperAgent/ScgiRequestParser.h',
-	'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
+agent_objects = AGENT_OBJECTS.keys.map { |x| "#{AGENT_OUTPUT_DIR}#{x}" }
+dependencies = agent_objects + [
 	'ext/common/Constants.h',
-	'ext/common/StaticString.h',
-	'ext/common/Account.h',
-	'ext/common/AccountsDatabase.h',
-	'ext/common/MessageServer.h',
-	'ext/common/FileDescriptor.h',
-	'ext/common/Logging.h',
-	'ext/common/ResourceLocator.h',
-	'ext/common/Utils/ProcessMetricsCollector.h',
-	'ext/common/Utils/SystemMetricsCollector.h',
-	'ext/common/Utils/VariantMap.h',
-	'ext/common/ApplicationPool2/Pool.h',
-	'ext/common/ApplicationPool2/Common.h',
-	'ext/common/ApplicationPool2/SuperGroup.h',
-	'ext/common/ApplicationPool2/Group.h',
-	'ext/common/ApplicationPool2/Process.h',
-	'ext/common/ApplicationPool2/Session.h',
-	'ext/common/ApplicationPool2/Options.h',
-	'ext/common/ApplicationPool2/PipeWatcher.h',
-	'ext/common/ApplicationPool2/Spawner.h',
-	'ext/common/ApplicationPool2/SpawnerFactory.h',
-	'ext/common/ApplicationPool2/SmartSpawner.h',
-	'ext/common/ApplicationPool2/DirectSpawner.h',
-	'ext/common/ApplicationPool2/ErrorRenderer.h',
+	'ext/common/agents/Main.cpp',
 	LIBBOOST_OXT,
-	helper_agent_libs.link_objects,
+	agent_libs.link_objects,
 	LIBEV_TARGET,
 	LIBEIO_TARGET
 ].flatten.compact
-file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
+file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
+	agent_objects_as_string = agent_objects.join(" ")
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	compile_cxx("ext/common/agents/HelperAgent/Main.cpp",
-		"-o #{AGENT_OUTPUT_DIR}PassengerHelperAgent.o " <<
+	compile_cxx("ext/common/agents/Main.cpp",
+		"-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
 		"#{EXTRA_PRE_CXXFLAGS} " <<
 		"-Iext -Iext/common " <<
 		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
-		"#{EXTRA_CXXFLAGS}")
-	create_executable("#{AGENT_OUTPUT_DIR}PassengerHelperAgent",
-		"#{AGENT_OUTPUT_DIR}PassengerHelperAgent.o",
-		"#{helper_agent_libs.link_objects_as_string} " <<
-		"#{LIBBOOST_OXT} " <<
-		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
-		"#{LIBEV_LIBS} " <<
-		"#{LIBEIO_LIBS} " <<
-		"#{PlatformInfo.portability_cxx_ldflags} " <<
-		"#{AGENT_LDFLAGS} " <<
-		"#{EXTRA_CXX_LDFLAGS}")
-end
-
-logging_agent_libs = COMMON_LIBRARY.only(:base, :logging_agent, 'AgentsBase.o',
-	'Utils/Base64.o', 'Utils/MD5.o', 'Utils/jsoncpp.o')
-dependencies = [
-	'ext/common/agents/LoggingAgent/Main.cpp',
-	'ext/common/agents/LoggingAgent/AdminController.h',
-	'ext/common/agents/LoggingAgent/LoggingServer.h',
-	'ext/common/agents/LoggingAgent/RemoteSender.h',
-	'ext/common/agents/LoggingAgent/DataStoreId.h',
-	'ext/common/agents/LoggingAgent/FilterSupport.h',
-	'ext/common/Constants.h',
-	'ext/common/ServerInstanceDir.h',
-	'ext/common/Logging.h',
-	'ext/common/EventedServer.h',
-	'ext/common/EventedClient.h',
-	'ext/common/Utils/VariantMap.h',
-	'ext/common/Utils/BlockingQueue.h',
-	logging_agent_libs.link_objects,
-	LIBBOOST_OXT,
-	LIBEV_TARGET
-].flatten.compact
-file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
-	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	compile_cxx("ext/common/agents/LoggingAgent/Main.cpp",
-		"-o #{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o " <<
-		"#{EXTRA_PRE_CXXFLAGS} " <<
-		"-Iext -Iext/common " <<
-		"#{AGENT_CFLAGS} #{LIBEV_CFLAGS} " <<
 		"#{PlatformInfo.curl_flags} " <<
 		"#{PlatformInfo.zlib_flags} " <<
 		"#{EXTRA_CXXFLAGS}")
-	create_executable("#{AGENT_OUTPUT_DIR}PassengerLoggingAgent",
-		"#{AGENT_OUTPUT_DIR}PassengerLoggingAgent.o",
-		"#{logging_agent_libs.link_objects_as_string} " <<
+	create_executable("#{AGENT_OUTPUT_DIR}#{AGENT_EXE}",
+		"#{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o",
+		"#{agent_libs.link_objects_as_string} " <<
+		"#{agent_objects_as_string} " <<
 		"#{LIBBOOST_OXT} " <<
 		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
 		"#{LIBEV_LIBS} " <<
+		"#{LIBEIO_LIBS} " <<
 		"#{PlatformInfo.curl_libs} " <<
 		"#{PlatformInfo.zlib_libs} " <<
 		"#{PlatformInfo.portability_cxx_ldflags} " <<
@@ -153,38 +157,6 @@ file AGENT_OUTPUT_DIR + 'PassengerLoggingAgent' => dependencies do
 		"#{EXTRA_CXX_LDFLAGS}")
 end
 
-spawn_preparer_libs = COMMON_LIBRARY.only('Utils/Base64.o', 'Utils/SystemTime.o',
-	'Utils/StrIntUtils.o', 'Utils/IOUtils.o')
-dependencies = [
-	'ext/common/agents/SpawnPreparer.cpp',
-	spawn_preparer_libs.link_objects,
-	LIBBOOST_OXT
-].flatten
-file AGENT_OUTPUT_DIR + 'SpawnPreparer' => dependencies do
-	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	create_executable(AGENT_OUTPUT_DIR + 'SpawnPreparer',
-		'ext/common/agents/SpawnPreparer.cpp',
-		"#{EXTRA_PRE_CXXFLAGS} #{EXTRA_PRE_CXX_LDFLAGS} " <<
-		"-Iext -Iext/common " <<
-		"#{AGENT_CFLAGS} #{EXTRA_CXXFLAGS} " <<
-		"#{spawn_preparer_libs.link_objects_as_string} " <<
-		"#{LIBBOOST_OXT} " <<
-		"#{PlatformInfo.portability_cxx_ldflags} " <<
-		"#{EXTRA_CXX_LDFLAGS}")
-end
-
-file AGENT_OUTPUT_DIR + 'EnvPrinter' => 'ext/common/agents/EnvPrinter.c' do
-	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	create_c_executable(AGENT_OUTPUT_DIR + 'EnvPrinter',
-		'ext/common/agents/EnvPrinter.c')
-end
-
-file AGENT_OUTPUT_DIR + 'TempDirToucher' => 'ext/common/agents/TempDirToucher.c' do
-	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-	create_c_executable(AGENT_OUTPUT_DIR + 'TempDirToucher',
-		'ext/common/agents/TempDirToucher.c')
-end
-
 task 'common:clean' do
 	sh "rm -rf #{AGENT_OUTPUT_DIR}"
 end