passenger 4.0.42 → 4.0.43

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.42'
+	VERSION_STRING = '4.0.43'
 	
 	PREFERRED_NGINX_VERSION = '1.6.0'
 	NGINX_SHA256_CHECKSUM = '943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a'

data/lib/phusion_passenger/config/list_instances_command.rb

@@ -0,0 +1,118 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 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 'admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'config/command'
+PhusionPassenger.require_passenger_lib 'config/utils'
+PhusionPassenger.require_passenger_lib 'utils/json'
+
+module PhusionPassenger
+module Config
+
+class ListInstancesCommand < Command
+	include PhusionPassenger::Config::Utils
+
+	def run
+		parse_options
+		server_instances = AdminTools::ServerInstance.list
+		if @options[:json]
+			print_json(server_instances)
+		elsif server_instances.empty?
+			print_no_instances_running
+		else
+			print_instances(server_instances)
+		end
+	end
+
+private
+	def self.create_option_parser(options)
+		OptionParser.new do |opts|
+			nl = "\n" + ' ' * 37
+			opts.banner = "Usage: passenger-config list-instances [OPTIONS] <PID>\n"
+			opts.separator ""
+			opts.separator "  List all running #{PROGRAM_NAME} instances."
+			opts.separator ""
+
+			opts.on("--json", "Print output in JSON format") do
+				options[:json] = true
+			end
+			opts.on("-q", "--quiet", "Don't print anything if there are no #{PROGRAM_NAME} instances running") do
+				options[:quiet] = true
+			end
+			opts.on("-h", "--help", "Show this help") do
+				options[:help] = true
+			end
+		end
+	end
+
+	def help
+		puts @parser
+	end
+
+	def parse_options
+		super
+		if !@argv.empty?
+			help
+			abort
+		end
+	end
+
+	def print_no_instances_running
+		if !@options[:quiet]
+			puts "There are no #{PROGRAM_NAME} instances running."
+		end
+	end
+
+	def print_json(server_instances)
+		result = []
+		server_instances.each do |instance|
+			begin
+				description = instance.web_server_description
+			rescue Errno::EACCES, Errno::ENOENT
+				description = nil
+			end
+			result << {
+				:pid => instance.pid,
+				:description => description
+			}
+		end
+		puts PhusionPassenger::Utils::JSON.generate(result)
+	end
+
+	def print_instances(server_instances)
+		printf "%-8s   %s\n", "PID", "Description"
+		server_instances.each do |instance|
+			begin
+				description = instance.web_server_description
+			rescue Errno::EACCES, Errno::ENOENT
+				description = nil
+			end
+			printf "%-8s   %s\n", instance.pid, description
+		end
+	end
+end
+
+end # module Config
+end # module PhusionPassenger

data/lib/phusion_passenger/config/main.rb

@@ -30,8 +30,10 @@ module Config
 	KNOWN_COMMANDS = [
 		["detach-process", "DetachProcessCommand"],
 		["restart-app", "RestartAppCommand"],
+		["list-instances", "ListInstancesCommand"],
 		["build-native-support", "BuildNativeSupportCommand"],
 		["validate-install", "ValidateInstallCommand"],
+		["system-metrics", "SystemMetricsCommand"],
 		["about", "AboutCommand"]
 	]
 	
@@ -56,6 +58,8 @@ module Config
 		command_class, new_argv = lookup_command_class_by_argv(argv)
 		if help_requested?(argv)
 			help
+		elsif help_all_requested?(argv)
+			help(true)
 		elsif command_class
 			command = command_class.new(new_argv)
 			command.run
@@ -65,7 +69,7 @@ module Config
 		end
 	end
 
-	def self.help
+	def self.help(all = false)
 		puts "Usage: passenger-config <COMMAND> [options]"
 		puts "Tool for controlling or configurating a #{PROGRAM_NAME} instance or installation."
 		puts
@@ -74,14 +78,24 @@ module Config
 		puts "  restart-app           Restart an application"
 		puts
 		puts "Informational commands:"
-		puts "  validate-install      Validate this Phusion Passenger installation"
-		puts "  about                 Show information about Phusion Passenger"
+		puts "  validate-install      Validate this #{PROGRAM_NAME} installation"
+		puts "  list-instances        List running #{PROGRAM_NAME} instances"
+		puts "  about                 Show information about #{PROGRAM_NAME}"
 		puts
 		puts "Miscellaneous commands:"
 		puts "  build-native-support  Ensure that the native_support library for the current"
 		puts "                        Ruby interpeter is built"
+		if all
+			puts "  system-metrics        Display system metrics"
+		end
 		puts
-		puts "Type 'passenger-config <COMMAND> --help' for more information."
+		puts "Run 'passenger-config <COMMAND> --help' for more information about each"
+		puts "command."
+		if !all
+			puts
+			puts "There are also some advanced commands not shown in this help message. Run"
+			puts "'passenger-config --help-all' to learn more about them."
+		end
 	end
 
 private
@@ -89,6 +103,10 @@ private
 		return argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
 	end
 
+	def self.help_all_requested?(argv)
+		return argv.size == 1 && (argv[0] == "--help-all" || argv[0] == "help-all")
+	end
+
 	def self.lookup_command_class_by_argv(argv)
 		return nil if argv.empty?
 

data/lib/phusion_passenger/config/system_metrics_command.rb

@@ -0,0 +1,37 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 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.
+
+PhusionPassenger.require_passenger_lib 'config/command'
+
+module PhusionPassenger
+module Config
+
+class SystemMetricsCommand < Command
+	def run
+		exec("#{PhusionPassenger.agents_dir}/PassengerHelperAgent",
+			"system-metrics", *@argv)
+	end
+end
+
+end # module Config
+end # module PhusionPassenger

data/lib/phusion_passenger/config/utils.rb

@@ -50,7 +50,7 @@ module Utils
 		else
 			server_instances = AdminTools::ServerInstance.list
 			if server_instances.empty?
-				abort "*** ERROR: Phusion Passenger doesn't seem to be running."
+				abort "*** ERROR: #{PROGRAM_NAME} doesn't seem to be running."
 			elsif server_instances.size == 1
 				@server_instance = server_instances.first
 			else

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -40,7 +40,7 @@ module LoaderSharedHelpers
 		dump_ruby_environment
 		check_rvm_using_wrapper_script(options)
 		return sanitize_spawn_options(options)
-7	end
+	end
 
 	def check_rvm_using_wrapper_script(options)
 		ruby = options["ruby"]
@@ -92,7 +92,7 @@ module LoaderSharedHelpers
 	def dump_all_information
 		dump_ruby_environment
 		dump_envvars
-		dump_system_memory_stats
+		dump_system_metrics
 	end
 
 	def dump_ruby_environment
@@ -155,10 +155,13 @@ module LoaderSharedHelpers
 		# Don't care.
 	end
 
-	def dump_system_memory_stats
+	def dump_system_metrics
 		if dir = ENV['PASSENGER_DEBUG_DIR']
-			File.open("#{dir}/sysmemory", "wb") do |f|
-				f.write(`"#{PhusionPassenger.helper_scripts_dir}/system-memory-stats.py"`)
+			contents = `"#{PhusionPassenger.bin_dir}/passenger-config" system-metrics`
+			if $? && $?.exitstatus == 0
+				File.open("#{dir}/system_metrics", "wb") do |f|
+					f.write(contents)
+				end
 			end
 		end
 	rescue SystemCallError

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -268,7 +268,7 @@ public
 				"-c '#{filename}' -o '#{filename}.o'",
 				flags)
 			result = run_compiler(description, command, filename, source, true)
-			return result[:result] && result[:output] !~ /unknown warning option/i
+			return result && result[:result] && result[:output] !~ /unknown warning option/i
 		end
 	end
 	

data/resources/templates/error_layout.html.template

@@ -48,9 +48,9 @@
 				<dd><pre>{{ENVVARS|default=Unknown}}</pre></dd>
 				<dt>Ulimits</dt>
 				<dd><pre>{{ULIMIT|default=Unknown}}</pre></dd>
-				{{if SYSMEMORY}}
-					<dt>System memory usage</dt>
-					<dd><pre>{{SYSMEMORY|default=Unknown}}</pre></dd>
+				{{if SYSTEM_METRICS}}
+					<dt>System metrics</dt>
+					<dd><pre>{{SYSTEM_METRICS|default=Unknown}}</pre></dd>
 				{{/if}}
 				{{if RUBY_INFO}}
 					<dt>General Ruby interpreter information</dt>

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -10,7 +10,6 @@ namespace tut {
 	struct ApplicationPool2_DirectSpawnerTest {
 		ServerInstanceDirPtr serverInstanceDir;
 		ServerInstanceDir::GenerationPtr generation;
-		BackgroundEventLoop bg;
 		ProcessPtr process;
 		PipeWatcher::DataCallback gatherOutput;
 		string gatheredOutput;
@@ -18,7 +17,6 @@ namespace tut {
 		
 		ApplicationPool2_DirectSpawnerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
-			bg.start();
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 			gatherOutput = boost::bind(&ApplicationPool2_DirectSpawnerTest::_gatherOutput, this, _1, _2);
 			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
@@ -33,7 +31,7 @@ namespace tut {
 		}
 		
 		boost::shared_ptr<DirectSpawner> createSpawner(const Options &options) {
-			return boost::make_shared<DirectSpawner>(bg.safe,
+			return boost::make_shared<DirectSpawner>(
 				*resourceLocator, generation);
 		}
 		
@@ -64,7 +62,7 @@ namespace tut {
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 		
-		DirectSpawner spawner(bg.safe, *resourceLocator, generation);
+		DirectSpawner spawner(*resourceLocator, generation);
 		
 		try {
 			process = spawner.spawn(options);
@@ -86,7 +84,7 @@ namespace tut {
 		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"";
 		options.startupFile  = ".";
 		
-		DirectSpawner spawner(bg.safe, *resourceLocator, generation);
+		DirectSpawner spawner(*resourceLocator, generation);
 		
 		try {
 			process = spawner.spawn(options);

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -17,7 +17,6 @@ namespace tut {
 	struct ApplicationPool2_PoolTest {
 		ServerInstanceDirPtr serverInstanceDir;
 		ServerInstanceDir::GenerationPtr generation;
-		BackgroundEventLoop bg;
 		SpawnerConfigPtr spawnerConfig;
 		SpawnerFactoryPtr spawnerFactory;
 		PoolPtr pool;
@@ -35,11 +34,10 @@ namespace tut {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			retainSessions = false;
 			spawnerConfig = boost::make_shared<SpawnerConfig>();
-			spawnerFactory = boost::make_shared<SpawnerFactory>(bg.safe, *resourceLocator,
+			spawnerFactory = boost::make_shared<SpawnerFactory>(*resourceLocator,
 				generation, spawnerConfig);
 			pool = boost::make_shared<Pool>(spawnerFactory);
 			pool->initialize();
-			bg.start();
 			callback = boost::bind(&ApplicationPool2_PoolTest::_callback, this, _1, _2);
 			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
 			setPrintAppOutputAsDebuggingMessages(true);

data/test/cxx/ApplicationPool2/ProcessTest.cpp

@@ -48,7 +48,7 @@ namespace tut {
 	
 	TEST_METHOD(1) {
 		// Test initial state.
-		ProcessPtr process = boost::make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -59,7 +59,7 @@ namespace tut {
 	
 	TEST_METHOD(2) {
 		// Test opening and closing sessions.
-		ProcessPtr process = boost::make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -76,7 +76,7 @@ namespace tut {
 	TEST_METHOD(3) {
 		// newSession() checks out the socket with the smallest busyness number
 		// and sessionClosed() restores the session busyness statistics.
-		ProcessPtr process = boost::make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -121,7 +121,7 @@ namespace tut {
 	
 	TEST_METHOD(4) {
 		// If all sockets are at their full capacity then newSession() will fail.
-		ProcessPtr process = boost::make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -15,7 +15,6 @@ namespace tut {
 	struct ApplicationPool2_SmartSpawnerTest {
 		ServerInstanceDirPtr serverInstanceDir;
 		ServerInstanceDir::GenerationPtr generation;
-		BackgroundEventLoop bg;
 		ProcessPtr process;
 		PipeWatcher::DataCallback gatherOutput;
 		string gatheredOutput;
@@ -23,7 +22,6 @@ namespace tut {
 		
 		ApplicationPool2_SmartSpawnerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
-			bg.start();
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 			gatherOutput = boost::bind(&ApplicationPool2_SmartSpawnerTest::_gatherOutput, this, _1, _2);
 			setLogLevel(LVL_ERROR); // TODO: should be LVL_WARN
@@ -48,7 +46,7 @@ namespace tut {
 				command.push_back("exit-immediately");
 			}
 			
-			return boost::make_shared<SmartSpawner>(bg.safe,
+			return boost::make_shared<SmartSpawner>(
 				*resourceLocator,
 				generation,
 				command,
@@ -125,7 +123,7 @@ namespace tut {
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2; sleep 60");
-		SmartSpawner spawner(bg.safe,
+		SmartSpawner spawner(
 			*resourceLocator,
 			generation,
 			preloaderCommand,
@@ -155,7 +153,7 @@ namespace tut {
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
-		SmartSpawner spawner(bg.safe,
+		SmartSpawner spawner(
 			*resourceLocator,
 			generation,
 			preloaderCommand,
@@ -185,7 +183,7 @@ namespace tut {
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
-		SmartSpawner spawner(bg.safe,
+		SmartSpawner spawner(
 			*resourceLocator,
 			generation,
 			preloaderCommand,
@@ -212,7 +210,7 @@ namespace tut {
 			vector<string> preloaderCommand;
 			preloaderCommand.push_back("ruby");
 			preloaderCommand.push_back(resourceLocator->getHelperScriptsDir() + "/rack-preloader.rb");
-			SmartSpawner spawner(bg.safe,
+			SmartSpawner spawner(
 				*resourceLocator,
 				generation,
 				preloaderCommand,