passenger 4.0.5 → 4.0.6

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRpgpHAAoJECrHRaUKISqMmNkIAIbfyHTRn7w8hubsVIbNhaTn
-wbgIkDW2N7y9RQXCtjiCp8niJB5J0nguVsrU+vykoEPcQ8YVsDeo2OMrnWqZOQ3Y
-k94g/ZDDXg+g9FkaQ/6U1B0au48qqwJVquBz6rL8awkgWd8yve6UAO9i5Oum3YWz
-tuj1abiJxxZOOKhu6lGSe51nephHG35BUh0eNtO/PQCDptfjNBnEmDTmZL1xs3GM
-W/lwx8q4AQJU4gpA31qtRDDP7GSL/2OKE0rBUfXSaMF88X3SotNr+ohZSUm6siHG
-4R2m469J8+RBNOnjNY6xILrrC+/WYM5G5GTKtjP8lwL6RD5xJ9JtyEOuYT0UrAc=
-=TDNl
+iQEbBAABAgAGBQJR1eJgAAoJECrHRaUKISqMlOwH9iVnxxO+68qEAnLgklGOj6+C
+/ON2JZpMB7rVB3iL86C13gAE/zH+Ks7VxhUEr6pkK/XgNRxK23Y1key55yzxawLR
+0v9B7qQSPhLbhzrvBrQzVoGp9v1JOwM0yzp3mS4LJJT95+coNmhu6QeDH0xeFxMg
+OwP3q7n2vMz3k2RsFdgtYk9Ig10wfbqhCpsYEi3xx2mIHL4VO1YlJDbkcGp8VX30
+ZfhcZaui5Ytt7bc/euSWvqmGFrXQByzqAnv+RDzpaGFJ07b75YAeveManwDrcMkr
+22aolcN1OPfujTMzHxVyy59Mvlmj8itoBzweWdZZ2TwYHrD6tY0yNh9cvPx/4Q==
+=TeIY
 -----END PGP SIGNATURE-----

data/.travis.yml

@@ -1,16 +1,15 @@
 language: ruby
 
 env:
-  - TEST_FULL_COMPILE=1
   - TEST_CXX=1
   - TEST_CXX=1 SUDO=1
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
   - TEST_NGINX=1 TEST_RUBYGEMS_VERSION=1.8.25
   - TEST_APACHE2=1 TEST_RUBYGEMS_VERSION=1.8.25
+  - TEST_DEBIAN_PACKAGING=1 TEST_RUBYGEMS_VERSION=1.8.25
 
 before_install:
-  - sudo apt-get install apache2-mpm-worker apache2-threaded-dev
   - cp test/config.json.travis test/config.json
 
 script: ./dev/run_travis.sh

data/CONTRIBUTING.md

@@ -13,11 +13,19 @@ We require contributors to sign our [contributor agreement](http://www.phusion.n
 
 Please submit patches in the form of a Github pull request or as a patch on the [bug tracker](http://code.google.com/p/phusion-passenger/issues/list). Pull requests are preferred and generally get more attention because Github has better email notifications and better discussion capabilities.
 
+You should also install required developer tools. The following command will install everything you need:
+
+    rake test:install_deps
+
+If your system requires gems to be installed with root privileges, run:
+
+    rake test:install_deps SUDO=1
+
 ## Contributing documentation
 
 All good software should have good documentation, and we take this very seriously. However writing and maintaing quality documentation is not an easy task. If you are not skilled in C++ or programming, then writing documentation is the easiest way to contribute.
 
-Most documentation can be located in the `doc` directory, and are either written in Markdown or in Asciidoc format. They can be compiled to HTML with `rake doc`. You need [Mizuho](https://github.com/FooBarWidget/mizuho) to compile Asciidoc and [BlueCloth](http://deveiate.org/projects/BlueCloth) to compile Markdown.
+Most documentation can be located in the `doc` directory, and are either written in Markdown or in Asciidoc format. They can be compiled to HTML with `rake doc`. You need [Mizuho](https://github.com/FooBarWidget/mizuho) to compile Asciidoc and [BlueCloth](http://deveiate.org/projects/BlueCloth) to compile Markdown. Both gems are automatically installed as part of the Phusion Passenger developer tools.
 
 ## Contributing by bug triaging
 
@@ -57,9 +65,11 @@ Run the following command to compile everything:
     rake apache2
     rake nginx
 
+It is recommended that you install ccache and set the `USE_CCACHE=1` environment variable. The build system will then automatically wrap all compiler calls in ccache, significantly improving recompilation times.
+
 ### Running the unit tests
 
-The tests depend on all the usual Phusion Passenger dependencies, plus a bunch of additional dependencies that you can install with:
+The tests depend on the Phusion Passenger developer tools. Make sure they're installed:
 
     rake test:install_deps
 
@@ -105,18 +115,23 @@ The most important directories are:
 
  * `lib/phusion_passenger` <br>
    The source code for Ruby parts of Phusion Passenger.
- * `ext/phusion_passenger` <br>
-   Native extensions for Ruby, used by the spawn server.
+ * `ext/ruby` <br>
+   Native extension for Ruby. Phusion Passenger uses the functions in this extension for optimizing certain operations, but Phusion Passenger can also function without this extension.
  * `ext/apache2` <br>
    Apache 2-specific source code.
  * `ext/nginx` <br>
    Nginx-specific source code.
  * `ext/common` <br>
    Source code shared by the Apache and Nginx modules.
+ * `ext/common/agents` <br>
+   Source code of the Phusion agent executables, i.e. PassengerWatchdog, PassengerHelperAgent and PassengerLoggingAgent.
+   * PassengerWatchdog is is the main Phusion Passenger control process, starts PassengerHelperAgent and PassengerLoggingAgent, and restarts them when they crash. It also cleans everything up upon shut down.
+   * PassengerHelperAgent performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
+   * PassengerLoggingAgent processes Union Station data and sends them to the Union Station server.
  * `bin` <br>
    User executables.
  * `helper-scripts` <br>
-   Scripts used during runtime, but not directly executed by the user.
+   Scripts used during runtime, but not directly executed by the user. All the loaders - applications which are responsible for loading an application written in a certain language and hooking it up to Phusion Passenger - are in this directory.
  * `doc` <br>
    Various documentation.
  * `test` <br>

data/CONTRIBUTORS

@@ -0,0 +1,67 @@
+_why
+Adam Duke
+Alex Osborne
+Alex Tomlins
+Aman Gupta
+Andre Ferraz
+Andre Nathan
+Andy Allan
+Benjamin Fleischer
+Bernd Ahlers
+Chad Fowler
+Christoffer Sawicki
+Damien Le Berrigaud
+Dan Peterson
+Danial Pearce
+Dave Parfitt
+David Sissitka
+Dirk Mueller
+Dmitry Galinsky
+Dylan Vaughn
+Erik Ogan
+Evan Phoenix
+Gaspard Bucher
+Goffert van Gool
+Gregory Potamianos
+Hongli Lai (Phusion)
+Ian Ehlert
+isaac
+Isaac Reuben
+J.W. Koelewijn
+Jacob Harris
+James Miller
+Jan Berkel
+Jason Cannon
+jastix
+Jay Freeman (saurik)
+John Dewey
+John Leach
+Joshua Lund
+jpatterson
+Jude Nagurney
+Luuk Hendriks (Phusion)
+Magnus Holm
+Michal Papis
+Michał Pokrywka
+Mike
+Mike Boone
+Morton Jonuschat
+Nathaniel Bibler
+Neil Wilson
+Ninh Bui (Phusion)
+Pat Downey
+Paul Kmiec
+Perry Smith
+Philip M. Gollucci
+Redmar Kerkhoff
+remi
+Robin Bowes
+Ryo Onodera
+Saimon Moore
+Sam Pohlenz
+Sebastian Delmont
+Slippy Douglas
+Tim Carey-Smith
+Tinco Andringa (Phusion)
+W. Andrew Loe III
+Weyert de Boer

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Phusion
+Copyright (c) 2010-2013 Phusion
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS

@@ -1,3 +1,51 @@
+Release 4.0.6
+-------------
+
+ * Fixed a potential 100% CPU lock up in the crash handler, which only occurs
+   on OS X. Fixes issue #908.
+ * Fixed a crash in request handling, when certain events are trigger after
+   the client has already disconnected. Fixes issue #889.
+ * Phusion Passenger will no longer crash when the Phusion Passenger
+   native_support Ruby extension cannot be compiled, e.g. because the Ruby
+   development headers are not installed or because the current user has no
+   permission to save the native extension file. Fixes issue #890.
+ * Fixed OS X 10.9 support. Fixes issue #906.
+ * Removed dependency on bash, so that Phusion Passenger works out of the box
+   on BSD platforms without installing/configuring bash. Fixes issue #911.
+ * Fix 'PassengerPoolIdleTime 0' not being respected correctly. Issue #904.
+ * Admin tools improvement: it is now possible to see all currently running
+   requests by invoking `passenger-status --show=requests`.
+ * [Apache] Fixed compatibility with Apache pipe logging. Previously this
+   would cause Phusion Passenger to lock up with 100% CPU during Apache
+   restart.
+ * [Nginx] The Nginx configure script now checks whether 'ruby' is in $PATH.
+   Previously, if 'ruby' is not in $PATH, then the compilation process fails
+   with an obscure error.
+ * [Nginx] passenger-install-nginx-module now works properly even when Phusion
+   Passenger is installed through the Debian packages. Before, the installer
+   would tell you to install Phusion Passenger through the gem or tarball
+   instead.
+ * [Enterprise] Added pretty printing helpers to the Live IRB Console.
+ * Fixed permissions on a subdirectory in the server instance directory. The
+   server instance directory is a temporary directory that Phusion Passenger
+   uses to store working files, and is deleted after Phusion Passenger exits.
+   A subdirectory inside it is world-writable (but not world-readable) and is
+   used for storing Unix domain sockets created by different apps, which may
+   run as different users. These sockets had long random filenames to prevent
+   them from being guessed. However because of a typo, this subdirectory was
+   created with the setuid bit, when it should have sticky bit (to prevent
+   existing files from being deleted or renamed by a user that doesn't own the
+   file). This has now been fixed.
+ * If the server instance directory already exists, it will now be removed
+   first in order get correct directory permissions. If the directory still
+   exists after removal, Phusion Passenger aborts to avoid writing to a
+   directory with unexpected permissions. Fixes issue #910.
+ * The installer now checks whether the system has enough virtual memory, and
+   prints a helpful warning if it doesn't.
+ * Linux/AArch64 compatibility fixes. Patch contributed by Dirk Mueller.
+ * Improved documentation.
+
+
 Release 4.0.5
 -------------
 

data/Rakefile

@@ -36,6 +36,7 @@ else
 	require 'build/ruby_tests'
 	require 'build/integration_tests'
 	require 'build/misc'
+	require 'build/debian'
 	require 'build/rpm'
 end
 
@@ -49,8 +50,7 @@ end
 
 desc "Remove compiled files"
 task :clean do
-	sh "rm -rf build/cache"
-	sh "rm -rf libout"
+	sh "rm -rf buildout"
 end
 
 desc "Remove all generated files"

data/bin/passenger-config

@@ -37,9 +37,13 @@ def help
 	puts "Options:"
 	puts "  --root                     Show Phusion Passenger's root directory."
 	puts "  --includedir               Show the Nginx runtime library headers directory."
+	puts "  --nginx-addon-dir          Show the Phusion Passenger Nginx addon directory."
 	puts "  --nginx-libs               Show Nginx runtime library flags."
 	puts "  --compiled                 Check whether runtime libraries are compiled."
+	puts "  --natively-packaged        Check whether Phusion Passenger is natively packged."
 	puts "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
+	puts "  --rubyext-compat-id        Print the Ruby extension binary compatibility ID."
+	puts "  --cxx-compat-id            Print the C++ binary compatibility ID."
 	puts "  --version                  Show version number."
 end
 
@@ -55,6 +59,8 @@ when "--root"
 	puts PhusionPassenger.source_root
 when "--includedir"
 	puts PhusionPassenger.include_dir
+when "--nginx-addon-dir"
+	puts PhusionPassenger.nginx_addon_dir
 when "--nginx-libs"
 	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
 	if PhusionPassenger::PlatformInfo.has_math_library?
@@ -72,6 +78,12 @@ when "--compiled"
 	else
 		exit 1
 	end
+when "--natively-packaged"
+	if PhusionPassenger.natively_packaged?
+		exit 0
+	else
+		exit 1
+	end
 when "--ruby-command"
 	require 'phusion_passenger/platform_info/ruby'
 	ruby = PhusionPassenger::PlatformInfo.ruby_command
@@ -101,6 +113,12 @@ when "--ruby-command"
 	puts
 	puts "## Notes for RVM users"
 	puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
+when "--rubyext-compat-id"
+	require 'phusion_passenger/platform_info/binary_compatibility'
+	puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id
+when "--cxx-compat-id"
+	require 'phusion_passenger/platform_info/binary_compatibility'
+	puts PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
 when "--version"
 	puts PhusionPassenger::VERSION_STRING
 else

data/bin/passenger-install-apache2-module

@@ -93,6 +93,8 @@ class Installer < PhusionPassenger::AbstractInstaller
 		show_welcome_screen
 		check_dependencies || exit(1)
 		check_whether_apache_uses_compatible_mpm
+		check_whether_os_is_broken
+		check_whether_system_has_enough_ram
 		check_write_permission_to_passenger_root || exit(1)
 		if install_apache2_module
 			show_apache2_config_snippets

data/bin/passenger-install-nginx-module

@@ -69,15 +69,14 @@ class Installer < PhusionPassenger::AbstractInstaller
 		# Make sure the configure script finds the correct
 		# passenger-config command.
 		ENV['PATH'] = PhusionPassenger.bin_dir + ":" + ENV['PATH']
-
-		if PhusionPassenger.natively_packaged?
-			not_available_when_natively_packaged
-			exit(2)
-		end
 		
 		show_welcome_screen
 		check_dependencies || exit(1)
-		check_whether_we_can_write_to(PhusionPassenger.source_root) || exit(1)
+		if needs_compiling_support_files?
+			check_whether_we_can_write_to(PhusionPassenger.source_root) || exit(1)
+		end
+		check_whether_os_is_broken
+		check_whether_system_has_enough_ram
 		
 		download_and_install = should_we_download_and_install_nginx_automatically?
 		if pcre_is_installed?
@@ -104,7 +103,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		end
 		check_whether_we_can_write_to(nginx_prefix) || exit(1)
 		nginx_config_already_exists_before_installing = nginx_config_exists?(nginx_prefix)
-		if PhusionPassenger.originally_packaged?
+		if needs_compiling_support_files?
 			compile_passenger_support_files || exit(1)
 		end
 		if install_nginx(nginx_source_dir, nginx_prefix, extra_nginx_configure_flags)
@@ -132,14 +131,14 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 
 private
-	def not_available_when_natively_packaged
-		render_template 'nginx/not_available_when_natively_packaged'
-	end
-
 	def show_welcome_screen
 		render_template 'nginx/welcome', :version => VERSION_STRING
 		wait
 	end
+
+	def needs_compiling_support_files?
+		return PhusionPassenger.originally_packaged?
+	end
 	
 	def compile_passenger_support_files
 		new_screen
@@ -432,7 +431,7 @@ private
 		elsif !pcre_is_installed?
 			command << "--without-http_rewrite_module "
 		end
-		command << "--add-module='#{PhusionPassenger.source_root}/ext/nginx' #{extra_configure_flags}"
+		command << "--add-module='#{PhusionPassenger.nginx_addon_dir}' #{extra_configure_flags}"
 		command.strip!
 		return command
 	end

data/bin/passenger-memory-stats

@@ -110,6 +110,8 @@ class App
 	end
 	
 	def start
+		puts "Version: #{PhusionPassenger::VERSION_STRING}"
+		puts "Date   : #{Time.now}"
 		if @stats.apache_processes
 			print_process_list("Apache processes", @stats.apache_processes)
 		else

data/bin/passenger-status

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -35,56 +35,134 @@ require 'optparse'
 include PhusionPassenger::AdminTools
 include PhusionPassenger::Utils::AnsiColors
 
-def show_status(server_instance, options = {})
-	server_instance.connect(:passenger_status) do
-		case options[:show]
-		when 'pool'
-			begin
-				puts server_instance.status(:verbose => options[:verbose], :colorize => true)
-			rescue SystemCallError => e
-				STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
-				STDERR.puts e.to_s
-				exit 2
-			end
+DEFAULT_OPTIONS = { :show => 'pool' }.freeze
 
-		when 'backtraces'
-			begin
-				text = server_instance.backtraces
-			rescue SystemCallError => e
-				STDERR.puts "*** ERROR: Cannot query status for Passenger instance #{control_process.pid}:"
-				STDERR.puts e.to_s
-				exit 2
-			end
-		
-			# Colorize output
-			text.gsub!(/^(Thread .*:)$/, BLACK_BG + YELLOW + '\1' + RESET)
-			text.gsub!(/^( +in '.*? )(.*?)\(/, '\1' + BOLD + '\2' + RESET + '(')
-		
-			puts text
+
+##### Show status command #####
+
+def command_show_status(argv, options)
+	if argv.empty?
+		server_instance = find_sole_server_instance
+	else
+		server_instance = find_server_instance_on_pid(argv[0].to_i)
+	end
+	show_status(server_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
+	else
+		puts "It appears that multiple Passenger instances are running. Please select a"
+		puts "specific one by running:"
+		puts
+		puts "  passenger-status <PID>"
+		puts
+		puts "The following Passenger instances are running:"
+		server_instances.each do |instance|
+			puts "  PID: #{instance.pid}"
+		end
+		exit 1
+	end
+end
+
+def find_server_instance_on_pid(pid)
+	if server_instance = ServerInstance.for_pid(pid)
+		return server_instance
+	else
+		abort "ERROR: there doesn't seem to be a Phusion Passenger instance running on PID #{pid}."
+	end
+end
+
+def show_status(server_instance, options)
+	puts "Version : #{PhusionPassenger::VERSION_STRING}"
+	puts "Date    : #{Time.now}"
+	puts "Instance: #{server_instance.pid}"
+	case options[:show]
+	when 'pool'
+		client = server_instance.connect(:role => :passenger_status)
+		begin
+			puts client.pool_status(:verbose => options[:verbose], :colorize => true)
+		rescue SystemCallError => e
+			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
+			STDERR.puts e.to_s
+			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
+			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
+			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
 		
-		when 'xml'
-			begin
-				xml = server_instance.xml
-			rescue SystemCallError => e
-				STDERR.puts "*** ERROR: Cannot query status for Passenger instance #{control_process.pid}:"
-				STDERR.puts e.to_s
-				exit 2
-			end
-			
-			indented = format_with_xmllint(xml)
-			if indented
-				puts indented
-			else
-				puts xml
-				STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
-			end
+		indented = format_with_xmllint(xml)
+		if indented
+			puts indented
+		else
+			puts xml
+			STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
+		end
+
+	when 'union_station'
+		client = server_instance.connect(:role => :passenger_status, :socket_name => 'logging_admin')
+		begin
+			response = client.logging_agent_status
+		rescue SystemCallError => e
+			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{control_process.pid}:"
+			STDERR.puts e.to_s
+			exit 2
 		end
+
+		puts response
 	end
 rescue ServerInstance::RoleDeniedError
 	require 'phusion_passenger/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 format_with_xmllint(xml)
@@ -122,20 +200,23 @@ def format_with_xmllint(xml)
 	end
 end
 
-def start
-	options = { :show => 'pool' }
-	parser = OptionParser.new do |opts|
+
+##### Main command dispatcher #####
+
+def create_option_parser(options)
+	return OptionParser.new do |opts|
 		opts.banner = "Usage: passenger-status [options] [Phusion Passenger's PID]"
 		opts.separator ""
 		opts.separator "Tool for inspecting Phusion Passenger's internal status."
 		opts.separator ""
 
 		opts.separator "Options:"
-		opts.on("--show=pool|backtraces|xml", String,
-		        "Whether to show the pool's contents, \n" <<
+		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|backtraces|xml)\Z/
+			if what !~ /\A(pool|requests|backtraces|xml|union_station)\Z/
 				STDERR.puts "Invalid argument for --show."
 				exit 1
 			else
@@ -146,6 +227,11 @@ def start
 			options[:verbose] = true
 		end
 	end
+end
+
+def parse_argv
+	options = DEFAULT_OPTIONS.dup
+	parser = create_option_parser(options)
 	begin
 		parser.parse!
 	rescue OptionParser::ParseError => e
@@ -154,30 +240,27 @@ def start
 		puts "Please see '--help' for valid options."
 		exit 1
 	end
-	
-	if ARGV.empty?
-		server_instances = ServerInstance.list
-		if server_instances.empty?
-			STDERR.puts("ERROR: Phusion Passenger doesn't seem to be running.")
-			exit 2
-		elsif server_instances.size == 1
-			show_status(server_instances.first, options)
+
+	return options
+end
+
+def infer_command
+	if !ARGV[0] || ARGV[0] =~ /\A[0-9]+\Z/
+		return [:show_status, ARGV.dup]
+	else
+		command_name, *argv = ARGV
+		if respond_to?("command_#{command_name}")
+			return [command_name, argv]
 		else
-			puts "It appears that multiple Passenger instances are running. Please select a"
-			puts "specific one by running:"
-			puts
-			puts "  passenger-status <PID>"
-			puts
-			puts "The following Passenger instances are running:"
-			server_instances.each do |instance|
-				puts "  PID: #{instance.pid}"
-			end
-			exit 1
+			abort "ERROR: unrecognized command '#{command_name}'"
 		end
-	else
-		server_instance = ServerInstance.for_pid(ARGV[0].to_i)
-		show_status(server_instance, options)
 	end
 end
 
+def start
+	options = parse_argv
+	command, argv = infer_command
+	send("command_#{command}", argv, options)
+end
+
 start