passenger 2.2.2 → 2.2.3

data/DEVELOPERS.TXT

@@ -34,7 +34,11 @@ The most important directories are:
 [ ext/phusion_passenger ]
   Native extensions for Ruby, used by the spawn server.
 [ ext/apache2 ]
-  The Phusion Passenger Apache 2 module (mod_passenger).
+  Apache 2-specific source code.
+[ ext/nginx ]
+  Nginx-specific source code.
+[ ext/common ]
+  Source code shared by the Apache and Nginx modules.
 [ bin ]
   Executables.
 [ doc ]
@@ -47,8 +51,6 @@ The most important directories are:
   Stub code, used in the tests.
 
 Less important directories:
-[ lib/rake ]
-  Rake tasks.
 [ ext/boost ]
   A stripped-down and customized version of the Boost C++ library
   (www.boost.org).
@@ -59,8 +61,16 @@ Less important directories:
   for C++. Boost was modified to make use of the functionality provided by OXT.
 [ benchmark ]
   Benchmark tools.
+[ debian ]
+  Debian packaging files.
+[ man ]
+  Man pages.
 [ misc ]
   Miscellaneous tools.
+[ misc/rake ]
+  Rake tasks.
+[ vendor ]
+  Various vendored libraries.
 
 == Tests
 

data/Rakefile

@@ -36,6 +36,7 @@ OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE'])
 
 include PlatformInfo
 
+CC  = "gcc"
 CXX = "g++"
 LIBEXT = PlatformInfo.library_extension
 if OPTIMIZE
@@ -45,11 +46,11 @@ else
 end
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
-# Should be included last in the command string.
+# Should be included last in the command string, even after PlatformInfo.portability_cflags.
 EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}"
 
 # Extra linker flags that should always be passed to the linker.
-# Should be included last in the command string.
+# Should be included last in the command string, even after PlatformInfo.portability_ldflags.
 EXTRA_LDFLAGS  = ""
 
 
@@ -150,7 +151,7 @@ def define_common_library_task(output_dir, extra_compiler_flags = nil,
                                with_application_pool_server_exe = false,
                                boost_oxt_library = nil,
                                extra_compiler_flags_for_server_exe = nil,
-                               extra_linker_flags = nil)
+                               extra_linker_flags_for_server_exe = nil)
 	static_library = "#{output_dir}/libpassenger_common.a"
 	objects_output_dir = "#{output_dir}/libpassenger_common"
 	targets = [static_library]
@@ -159,7 +160,8 @@ def define_common_library_task(output_dir, extra_compiler_flags = nil,
 	flags =  "-Iext -Iext/common #{extra_compiler_flags} "
 	flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 	common_object_files = []
-	['Utils.cpp', 'Logging.cpp', 'SystemTime.cpp', 'CachedFileStat.cpp'].each do |source_file|
+	['Utils.cpp', 'Logging.cpp', 'SystemTime.cpp', 'CachedFileStat.cpp',
+	 'Base64.cpp'].each do |source_file|
 		object_name = source_file.sub(/\.cpp$/, '.o')
 		object_file = "#{objects_output_dir}/#{object_name}"
 		header_file = source_file.sub(/\.cpp$/, '.h')
@@ -185,12 +187,14 @@ def define_common_library_task(output_dir, extra_compiler_flags = nil,
 			'ext/common/ApplicationPool.h',
 			'ext/common/Application.h',
 			'ext/common/StandardApplicationPool.h',
+			'ext/common/ApplicationPoolStatusReporter.h',
 			'ext/common/MessageChannel.h',
 			'ext/common/SpawnManager.h',
 			'ext/common/PoolOptions.h',
-			'ext/common/FileChecker.h',
+			'ext/common/StringListCreator.h',
+			'ext/common/FileChangeChecker.h',
 			'ext/common/SystemTime.h',
-			'ext/common/CachedFileStat.h',
+			'ext/common/CachedFileStat.hpp',
 			boost_oxt_library,
 			static_library
 		]) do
@@ -203,7 +207,7 @@ def define_common_library_task(output_dir, extra_compiler_flags = nil,
 				"#{EXTRA_CXXFLAGS} " <<
 				"#{static_library} " <<
 				"#{boost_oxt_library} " <<
-				"#{extra_linker_flags} " <<
+				"#{extra_linker_flags_for_server_exe} " <<
 				"#{PlatformInfo.portability_ldflags} " <<
 				EXTRA_LDFLAGS
 			)
@@ -242,7 +246,9 @@ end
 			ext/common/Application.h
 			ext/common/MessageChannel.h
 			ext/common/PoolOptions.h
+			ext/common/StringListCreator.h
 			ext/common/Version.h
+			ext/common/Timer.h
 			ext/common/Utils.h)
 	}
 	APACHE2_OBJECTS = APACHE2_INPUT_FILES.keys
@@ -253,8 +259,7 @@ end
 		PlatformInfo.apache2_module_cflags)
 	APACHE2_COMMON_LIBRARY    = define_common_library_task("ext/apache2",
 		PlatformInfo.apache2_module_cflags,
-		true, APACHE2_BOOST_OXT_LIBRARY, nil,
-		PlatformInfo.apache2_module_ldflags)
+		true, APACHE2_BOOST_OXT_LIBRARY)
 	
 	
 	desc "Build Apache 2 module"
@@ -382,6 +387,9 @@ end
 	TEST_CXX_OBJECTS = {
 		'test/CxxTestMain.o' => %w(
 			test/CxxTestMain.cpp),
+		'test/support/Support.o' => %w(
+			test/support/Support.cpp
+			test/support/Support.h),
 		'test/MessageChannelTest.o' => %w(
 			test/MessageChannelTest.cpp
 			ext/common/MessageChannel.h),
@@ -389,12 +397,14 @@ end
 			test/SpawnManagerTest.cpp
 			ext/common/SpawnManager.h
 			ext/common/PoolOptions.h
+			ext/common/StringListCreator.h
 			ext/common/Application.h
 			ext/common/MessageChannel.h),
 		'test/ApplicationPoolServerTest.o' => %w(
 			test/ApplicationPoolServerTest.cpp
 			ext/common/ApplicationPoolServer.h
 			ext/common/PoolOptions.h
+			ext/common/StringListCreator.h
 			ext/common/MessageChannel.h),
 		'test/ApplicationPoolServer_ApplicationPoolTest.o' => %w(
 			test/ApplicationPoolServer_ApplicationPoolTest.cpp
@@ -403,6 +413,7 @@ end
 			ext/common/ApplicationPool.h
 			ext/common/SpawnManager.h
 			ext/common/PoolOptions.h
+			ext/common/StringListCreator.h
 			ext/common/Application.h
 			ext/common/MessageChannel.h),
 		'test/StandardApplicationPoolTest.o' => %w(
@@ -412,14 +423,21 @@ end
 			ext/common/StandardApplicationPool.h
 			ext/common/SpawnManager.h
 			ext/common/PoolOptions.h
-			ext/common/FileChecker.h
+			ext/common/StringListCreator.h
+			ext/common/FileChangeChecker.h
+			ext/common/CachedFileStat.hpp
 			ext/common/Application.h),
 		'test/PoolOptionsTest.o' => %w(
 			test/PoolOptionsTest.cpp
-			ext/common/PoolOptions.h),
-		'test/StaticString.o' => %w(
+			ext/common/PoolOptions.h
+			ext/common/StringListCreator.h),
+		'test/StaticStringTest.o' => %w(
 			test/StaticStringTest.cpp
 			ext/common/StaticString.h),
+		'test/Base64Test.o' => %w(
+			test/Base64Test.cpp
+			ext/common/Base64.h
+			ext/common/Base64.cpp),
 		'test/ScgiRequestParserTest.o' => %w(
 			test/ScgiRequestParserTest.cpp
 			ext/nginx/ScgiRequestParser.h
@@ -427,17 +445,17 @@ end
 		'test/HttpStatusExtractorTest.o' => %w(
 			test/HttpStatusExtractorTest.cpp
 			ext/nginx/HttpStatusExtractor.h),
-		'test/FileCheckerTest.o' => %w(
-			test/FileCheckerTest.cpp
-			ext/common/FileChecker.h
-			ext/common/CachedFileStat.h),
+		'test/FileChangeCheckerTest.o' => %w(
+			test/FileChangeCheckerTest.cpp
+			ext/common/FileChangeChecker.h
+			ext/common/CachedFileStat.hpp),
 		'test/SystemTimeTest.o' => %w(
 			test/SystemTimeTest.cpp
 			ext/common/SystemTime.h
 			ext/common/SystemTime.cpp),
 		'test/CachedFileStatTest.o' => %w(
 			test/CachedFileStatTest.cpp
-			ext/common/CachedFileStat.h
+			ext/common/CachedFileStat.hpp
 			ext/common/CachedFileStat.cpp),
 		'test/UtilsTest.o' => %w(
 			test/UtilsTest.cpp
@@ -518,7 +536,7 @@ end
 	end
 	
 	TEST_OXT_OBJECTS.each_pair do |target, sources|
-		file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } do
+		file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } + ['test/support/Support.h'] do
 			Dir.chdir('test/oxt') do
 				puts "### In test/oxt:"
 				compile_cxx sources[0], TEST_OXT_CFLAGS
@@ -668,7 +686,7 @@ spec = Gem::Specification.new do |s|
 		'doc/*/*/*/*/*/*',
 		'man/*',
 		'debian/*',
-		'ext/common/*.{cpp,c,h}',
+		'ext/common/*.{cpp,c,h,hpp}',
 		'ext/apache2/*.{cpp,h,c,TXT}',
 		'ext/nginx/*.{c,cpp,h}',
 		'ext/nginx/config',
@@ -683,21 +701,12 @@ spec = Gem::Specification.new do |s|
 		'misc/*/*',
 		'vendor/**/*',
 		'test/*.{rb,cpp,example}',
-		'test/support/*',
+		'test/support/*.{cpp,h,rb}',
 		'test/oxt/*.cpp',
-		'test/ruby/*',
-		'test/ruby/*/*',
-		'test/integration_tests/*',
-		'test/stub/*',
-		'test/stub/*/*',
-		'test/stub/*/*/*',
-		'test/stub/*/*/*/*',
-		'test/stub/*/*/*/*/*',
-		'test/stub/*/*/*/*/*/*',
-		'test/stub/*/*/*/*/*/*/*'
-	] - Dir['test/stub/*/log/*'] \
-	  - Dir['test/stub/*/tmp/*/*'] \
-	  - Dir['test/stub/apache2/*.{pid,lock,log}']
+		'test/ruby/**/*',
+		'test/integration_tests/**/*',
+		'test/stub/**/*'
+	]
 	s.executables = [
 		'passenger-spawn-server',
 		'passenger-install-apache2-module',

data/bin/passenger-install-apache2-module

@@ -49,8 +49,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 			Dependencies::RubyGems,
 			Dependencies::Rake,
 			Dependencies::Apache2,
-			Dependencies::Apache2_DevHeaders,
-			Dependencies::FastThread
+			Dependencies::Apache2_DevHeaders
 		]
 		if Dependencies.fastthread_required?
 			result << Dependencies::FastThread

data/bin/passenger-install-nginx-module

@@ -36,18 +36,21 @@ include PlatformInfo
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
-	NGINX_VERSION = "0.6.36"
+	NGINX_VERSION = "0.6.37"
 	
 	def dependencies
-		return [
+		result = [
 			Dependencies::GCC,
 			Dependencies::Ruby_DevHeaders,
 			Dependencies::Ruby_OpenSSL,
 			Dependencies::RubyGems,
 			Dependencies::Rake,
-			Dependencies::FastThread,
 			Dependencies::Zlib_Dev
 		]
+		if Dependencies.fastthread_required?
+			result << Dependencies::FastThread
+		end
+		return result
 	end
 	
 	def users_guide
@@ -59,7 +62,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		show_welcome_screen
 		check_dependencies || exit(1)
 		
-		check_write_permission_to_passenger_root || exit(1)
+		check_whether_we_can_write_to(PASSENGER_ROOT) || exit(1)
 		
 		download_and_install = should_we_download_and_install_nginx_automatically?
 		if pcre_is_installed?
@@ -102,21 +105,6 @@ private
 		wait
 	end
 	
-	def check_write_permission_to_passenger_root
-		File.new("__test__.txt", "w").close
-		return true
-	rescue
-		new_screen
-		if Process.uid == 0
-			render_template 'no_write_permission_to_passenger_root'
-		else
-			render_template 'run_installer_as_root'
-		end
-		return false
-	ensure
-		File.unlink("__test__.txt") rescue nil
-	end
-	
 	def compile_passenger_support_files
 		new_screen
 		color_puts "<banner>Compiling Passenger support files...</banner>"

data/bin/passenger-status

@@ -22,9 +22,10 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../ext"))
 require 'phusion_passenger/admin_tools/control_process'
+require 'optparse'
 
 include PhusionPassenger::AdminTools
 
@@ -32,30 +33,78 @@ include PhusionPassenger::AdminTools
 RESET   = "\e[0m"
 BOLD    = "\e[1m"
 YELLOW  = "\e[33m"
+BLACK_BG = "\e[40m"
 BLUE_BG = "\e[44m"
 
-def show_status(control_process, format = :text)
-	begin
-		text = control_process.status
-	rescue SystemCallError => e
-		STDERR.puts "*** ERROR: Cannot query status for Passenger instance #{control_process.pid}:"
-		STDERR.puts e.to_s
-		exit 2
+def show_status(control_process, options = {})
+	case options[:show]
+	when 'pool'
+		begin
+			text = control_process.status
+		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!(/^(----)(.*)$/, YELLOW + BLUE_BG + BOLD + '\1\2' + RESET)
+		
+		puts text
+		
+	when 'backtraces'
+		begin
+			text = control_process.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
 	end
-	# Colorize output
-	text.gsub!(/^(----)(.*)$/, YELLOW + BLUE_BG + BOLD + '\1\2' + RESET)
-	text.gsub!(/^( +in '.*? )(.*?)\(/, '\1' + BOLD + '\2' + RESET + '(')
-	puts text
 end
 
 def start
+	options = { :show => 'pool' }
+	parser = 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", String,
+		        "Whether to show the pool's contents or\n" <<
+		        "#{' ' * 37}the backtraces of all threads.") do |what|
+			if what !~ /\A(pool|backtraces)\Z/
+				STDERR.puts "Invalid argument for --show."
+				exit 1
+			else
+				options[:show] = what
+			end
+		end
+	end
+	begin
+		parser.parse!
+	rescue OptionParser::ParseError => e
+		puts e
+		puts
+		puts "Please see '--help' for valid options."
+		exit 1
+	end
+	
 	if ARGV.empty?
 		control_processes = ControlProcess.list
 		if control_processes.empty?
 			STDERR.puts("ERROR: Phusion Passenger doesn't seem to be running.")
 			exit 2
 		elsif control_processes.size == 1
-			show_status(control_processes.first)
+			show_status(control_processes.first, options)
 		else
 			puts "It appears that multiple Passenger instances are running. Please select a"
 			puts "specific one by running:"
@@ -69,7 +118,7 @@ def start
 			exit 1
 		end
 	else
-		show_status(ControlProcess.for_pid(ARGV[0].to_i))
+		show_status(ControlProcess.for_pid(ARGV[0].to_i), options)
 	end
 end
 

data/bin/passenger-stress-test

@@ -22,8 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../ext"))
 require 'rubygems'
 require 'optparse'
 require 'socket'

data/doc/ApplicationPool algorithm.txt

@@ -65,12 +65,6 @@ explicitly define some special types:
     application instance in this domain may process. After having processed this
     many requests, the application instance will be shut down.
     A value of 0 indicates that there is no maximum.
-  
-  * restart_file_checker
-    An object which monitors the restart.txt file, which belongs to this
-    application root, for changes. This object has the method changed(),
-    which rteurns whether restart.txt's timestamp has changed since the last
-    check.
 
 - AppContainer
   A compound type (class) which contains an application instance, as well as
@@ -99,7 +93,7 @@ explicitly define some special types:
   A structure containing additional information used by the spawn manager's
   spawning process, as well as by the get() function.
   
-  A PoolOptions has the following members:
+  A PoolOptions has at least the following members:
   * max_requests (unsigned integer) - The maximum number of requests that the
     application instance may process. After having processed this many requests,
     the application instance will be shut down. A value of 0 indicates that there
@@ -107,6 +101,9 @@ explicitly define some special types:
   * use_global_queue (boolean) - Whether to use a global queue for all
     application instances, or a queue that's private to the application instance.
     The users guide explains this feature in more detail.
+  * restart_dir (string) - The directory in which the algorithm should look for
+    restart.txt and always_restart.txt. The existance and modification times of
+    these files tell the algorithm whether an application should be restarted.
 
 === Special functions
 
@@ -226,17 +223,18 @@ function get(app_root, options):
 function spawn_or_use_existing(app_root, options):
 	domain = domains[app_root]
 	
-	if (domain != nil) and (needs_restart(app_root, domain)):
-		for all container in domain.instances:
-			if container.sessions == 0:
-				inactive_apps.remove(container.ia_iterator)
-			else:
-				active--
-			domain.instances.remove(container.iterator)
-			count--
-		domains.remove(app_root)
-		list = nil
+	if needs_restart(app_root, options):
+		if (domain != nil):
+			for all container in domain.instances:
+				if container.sessions == 0:
+					inactive_apps.remove(container.ia_iterator)
+				else:
+					active--
+				domain.instances.remove(container.iterator)
+				count--
+			domains.remove(app_root)
 		Tell spawn server to reload code for app_root.
+		domain = nil
 	
 	if domain != nil:
 		# There are apps for this app root.
@@ -320,7 +318,6 @@ function spawn_or_use_existing(app_root, options):
 		if domain == nil:
 			domain = new Domain
 			initialize domain.instances
-			initialize domain.restart_file_checker with "$app_root/tmp/restart.txt"
 			domain.size = 1
 			domain.max_requests = options.max_requests
 			domains[app_root] = domain
@@ -362,10 +359,17 @@ function session_has_been_closed(container):
 					active--
 
 
-function needs_restart(app_root, domain):
-	always_restart_file = "$app_root/tmp/always_restart.txt"
-	return (file_exists(always_restart_file)) or
-	       (domain.restart_file_checker.changed())
+function needs_restart(app_root, options):
+	if (options.restart_dir is not set):
+		restart_dir = app_root + "/tmp"
+	else if (options.restart_dir is an absolute path):
+		restart_dir = options.restart_dir
+	else:
+		restart_dir = app_root + "/" + options.restart_dir
+	
+	return (file_exists("$restart_dir/always_restart.txt")) or
+	       (we haven't seen "$restart_dir/restart.txt" before) or
+	       ("$restart_dir/restart.txt" changed since the last time we checked)
 
 
 # The following thread will be responsible for cleaning up idle application