passenger 4.0.30 → 4.0.31

data/lib/phusion_passenger/console_text_template.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2013 Phusion
 #
@@ -22,7 +23,7 @@
 #  THE SOFTWARE.
 
 require 'erb'
-require 'phusion_passenger/utils/ansi_colors'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/constants.rb

@@ -21,8 +21,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger'
-
 module PhusionPassenger
 	PASSENGER_ANALYTICS_WEB_LOG = "PASSENGER_ANALYTICS_WEB_LOG".freeze
 	PASSENGER_TXN_ID            = "PASSENGER_TXN_ID".freeze
@@ -74,6 +72,13 @@ module PhusionPassenger
 		NGINX_DOC_URL       = "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 		STANDALONE_DOC_URL  = "http://www.modrails.com/documentation/Users%20guide%20Standalone.html"
 		SUPPORT_URL         = "http://www.phusionpassenger.com/support"
+		ENTERPRISE_URL      = "http://www.phusionpassenger.com/enterprise"
+		DEB_DEV_PACKAGE           = "passenger-dev"
+		DEB_APACHE_MODULE_PACKAGE = "libapache2-mod-passenger"
+		DEB_NGINX_PACKAGE         = "nginx-extras"
+		RPM_DEV_PACKAGE           = "passenger-devel"
+		RPM_APACHE_MODULE_PACKAGE = "mod_passenger"
+		RPM_NGINX_PACKAGE         = "nginx"
 		STANDALONE_NGINX_CONFIGURE_OPTIONS =
 			"--with-cc-opt='-Wno-error' " <<
 			"--without-http_fastcgi_module " <<

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -22,8 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/public_api'
-require 'phusion_passenger/debug_logging'
+PhusionPassenger.require_passenger_lib 'public_api'
+PhusionPassenger.require_passenger_lib 'debug_logging'
 
 module PhusionPassenger
 
@@ -42,6 +42,8 @@ module LoaderSharedHelpers
 	# To be called whenever the (pre)loader is about to abort with an error.
 	def about_to_abort(exception = nil)
 		dump_all_information
+		# https://code.google.com/p/phusion-passenger/issues/detail?id=1039
+		puts
 	end
 
 	def to_boolean(value)
@@ -152,7 +154,7 @@ module LoaderSharedHelpers
 		DebugLogging.log_level = options["log_level"] if options["log_level"]
 
 		# Instantiate the analytics logger if requested. Can be nil.
-		require 'phusion_passenger/analytics_logger'
+		PhusionPassenger.require_passenger_lib 'analytics_logger'
 		options["analytics_logger"] = AnalyticsLogger.new_from_options(options)
 	end
 	
@@ -220,15 +222,6 @@ module LoaderSharedHelpers
 			end
 		end
 		
-		# Bundler might remove Phusion Passenger from the load path in its zealous
-		# attempt to un-require RubyGems, so here we put Phusion Passenger back
-		# into the load path. This must be done before loading the app's startup
-		# file because the app might require() Phusion Passenger files.
-		if !$LOAD_PATH.include?(PhusionPassenger.ruby_libdir)
-			$LOAD_PATH.unshift(PhusionPassenger.ruby_libdir)
-			$LOAD_PATH.uniq!
-		end
-		
 		
 		# !!! NOTE !!!
 		# If the app is using Bundler then any dependencies required past this
@@ -242,15 +235,6 @@ module LoaderSharedHelpers
 	# This method is to be called after loading the application code but
 	# before forking a worker process.
 	def after_loading_app_code(options)
-		# Even though run_load_path_setup_code() restores the Phusion Passenger
-		# load path after setting up Bundler, the app itself might also
-		# remove Phusion Passenger from the load path for whatever reason,
-		# so here we restore the load path again.
-		if !$LOAD_PATH.include?(PhusionPassenger.ruby_libdir)
-			$LOAD_PATH.unshift(PhusionPassenger.ruby_libdir)
-			$LOAD_PATH.uniq!
-		end
-		
 		# Post-install framework extensions. Possibly preceded by a call to
 		# PhusionPassenger.install_framework_extensions!
 		if defined?(::Rails) && !defined?(::Rails::VERSION)
@@ -268,6 +252,13 @@ module LoaderSharedHelpers
 		end
 	end
 	
+	def advertise_readiness
+		# https://code.google.com/p/phusion-passenger/issues/detail?id=1039
+		puts
+
+		puts "!> Ready"
+	end
+
 	def advertise_sockets(output, request_handler)
 		request_handler.server_sockets.each_pair do |name, options|
 			concurrency = PhusionPassenger.advertised_concurrency_level || options[:concurrency]

data/lib/phusion_passenger/message_client.rb

@@ -23,9 +23,9 @@
 #  THE SOFTWARE.
 
 require 'socket'
-require 'phusion_passenger/message_channel'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/utils/tmpdir'
+PhusionPassenger.require_passenger_lib 'message_channel'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 
 module PhusionPassenger
 
@@ -112,7 +112,18 @@ class MessageClient
 		check_security_response
 		return read_scalar
 	end
-	
+
+	def restart_app_group(app_group_name, options = {})
+		write("restart_app_group", app_group_name, *options.to_a.flatten)
+		check_security_response
+		result = read
+		if result.nil?
+			raise EOFError
+		else
+			return result.first == "true"
+		end
+	end
+
 	def helper_agent_requests
 		write("requests")
 		check_security_response

data/lib/phusion_passenger/native_support.rb

@@ -32,29 +32,36 @@ class NativeSupportLoader
 		if defined?(NativeSupport)
 			return true
 		else
-			require 'phusion_passenger'
 			load_from_native_support_output_dir ||
-			load_from_source_root ||
+			load_from_buildout_dir ||
 			load_from_load_path ||
 			load_from_home_dir
 		end
 	end
 	
 	def start
-		try_load || download_binary_and_load || compile_and_load
+		if try_load
+			return true
+		elsif download_binary_and_load || compile_and_load
+			STDERR.puts " --> #{library_name} successfully loaded."
+			return true
+		else
+			STDERR.puts " --> Continuing without #{library_name}."
+			return false
+		end
 	end
 
 private
 	def archdir
 		@archdir ||= begin
-			require 'phusion_passenger/platform_info/binary_compatibility'
+			PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 			PlatformInfo.ruby_extension_binary_compatibility_id
 		end
 	end
 	
 	def libext
 		@libext ||= begin
-			require 'phusion_passenger/platform_info/operating_system'
+			PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 			PlatformInfo.library_extension
 		end
 	end
@@ -74,23 +81,13 @@ private
 		File.join(PhusionPassenger.ruby_extension_source_dir, "extconf.rb")
 	end
 	
-	def native_support_dir_in_source_root
-		if PhusionPassenger.originally_packaged?
-			@native_support_dir_in_source_root ||=
-				File.expand_path("#{PhusionPassenger.source_root}/buildout/ruby")
-		else
-			return nil
-		end
-	end
-
 	def load_from_native_support_output_dir
 		# Quick workaround for people suffering from
 		# https://code.google.com/p/phusion-passenger/issues/detail?id=865
 		output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']
 		if output_dir && !output_dir.empty?
 			begin
-				require "#{output_dir}/#{VERSION_STRING}/#{archdir}/#{library_name}"
-				return true
+				return load_native_extension("#{output_dir}/#{VERSION_STRING}/#{archdir}/#{library_name}")
 			rescue LoadError
 				return false
 			end
@@ -99,11 +96,10 @@ private
 		end
 	end
 	
-	def load_from_source_root
-		if PhusionPassenger.originally_packaged?
+	def load_from_buildout_dir
+		if PhusionPassenger.buildout_dir
 			begin
-				require "#{native_support_dir_in_source_root}/#{archdir}/#{library_name}"
-				return true
+				return load_native_extension("#{PhusionPassenger.buildout_dir}/ruby/#{archdir}/#{library_name}")
 			rescue LoadError
 				return false
 			end
@@ -113,16 +109,14 @@ private
 	end
 	
 	def load_from_load_path
-		require 'passenger_native_support'
-		return true
+		return load_native_extension('passenger_native_support')
 	rescue LoadError
 		return false
 	end
 	
 	def load_from_home_dir
 		begin
-			require "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}"
-			return true
+			return load_native_extension("#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}")
 		rescue LoadError
 			return false
 		end
@@ -133,16 +127,18 @@ private
 			return
 		end
 		if ENV['PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY'] == '0'
-			STDERR.puts "*** Phusion Passenger: PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY set, " +
-				"not downloading precompiled binary"
+			STDERR.puts " --> Skipping downloading of precompiled #{library_name}"
 			return
 		end
-		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
-			"the current Ruby interpreter. Downloading precompiled binary from the Phusion server " +
-			"(set PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY=0 to disable)..."
+
+		STDERR.puts " --> Downloading precompiled #{library_name} for the current Ruby interpreter..."
+		STDERR.puts "     (set PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY=0 to disable)"
 		
-		require 'phusion_passenger/platform_info/ruby'
-		require 'phusion_passenger/utils/tmpio'
+		require 'shellwords'
+		require 'logger'
+		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+		PhusionPassenger.require_passenger_lib 'utils/tmpio'
+		PhusionPassenger.require_passenger_lib 'utils/download'
 		PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |dir|
 			Dir.chdir(dir) do
 				basename = "rubyext-#{archdir}.tar.gz"
@@ -150,9 +146,10 @@ private
 					return false
 				end
 
-				sh "tar", "xzf", basename
-				sh "rm", "-f", basename
-				STDERR.puts "Checking whether downloaded binary is usable..."
+				s_basename = Shellwords.escape(basename)
+				sh "tar xzf #{s_basename}"
+				sh "rm -f #{s_basename}"
+				STDERR.puts "     Checking whether downloaded binary is usable..."
 
 				File.open("test.rb", "w") do |f|
 					f.puts(%Q{
@@ -165,19 +162,19 @@ private
 				if sh_nonfatal("#{PlatformInfo.ruby_command} -I. test.rb") &&
 				   File.exist?("test.txt") &&
 				   File.read("test.txt") == "hello\n"
-					STDERR.puts "Binary is usable."
+					STDERR.puts "     Binary is usable."
 					File.unlink("test.rb")
 					File.unlink("test.txt")
 					result = try_directories(installation_target_dirs) do |target_dir|
 						files = Dir["#{dir}/*"]
-						STDERR.puts "# Installing " + files.map{ |n| File.basename(n) }.join(' ')
+						STDERR.puts "     Installing " + files.map{ |n| File.basename(n) }.join(' ')
 						FileUtils.cp(files, target_dir)
-						require "#{target_dir}/#{library_name}"
-						[true, false]
+						load_result = load_native_extension("#{target_dir}/#{library_name}")
+						[load_result, false]
 					end
 					return result
 				else
-					STDERR.puts "Binary is not usable."
+					STDERR.puts "     Binary is not usable."
 					return false
 				end
 			end
@@ -186,23 +183,41 @@ private
 
 	def compile_and_load
 		if ENV['PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY'] == '0'
-			STDERR.puts "*** Phusion Passenger: PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY set, " +
-				"not compiling native_support"
+			STDERR.puts " --> Skipping compiling of #{library_name}"
+			return false
+		end
+
+		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.ruby_extension_source_dir)
+			PhusionPassenger.require_passenger_lib 'constants'
+			STDERR.puts " --> No #{library_name} found for current Ruby interpreter."
+			case PhusionPassenger.native_packaging_method
+			when 'deb'
+				STDERR.puts "     This library provides various optimized routines that make"
+				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} faster. Please run 'sudo apt-get install #{PhusionPassenger::DEB_DEV_PACKAGE}'"
+				STDERR.puts "     so that #{PhusionPassenger::PROGRAM_NAME} can compile one on the next run."
+			when 'rpm'
+				STDERR.puts "     This library provides various optimized routines that make"
+				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} faster. Please run 'sudo yum install #{PhusionPassenger::RPM_DEV_PACKAGE}'"
+				STDERR.puts "     so that #{PhusionPassenger::PROGRAM_NAME} can compile one on the next run."
+			else
+				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} can compile one, but an extra package must be installed"
+				STDERR.puts "     first. Please ask your operating system vendor for instructions."
+			end
 			return false
 		end
 
-		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
-			"the current Ruby interpreter. Compiling one (set " +
-			"PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0 to disable)..."
+		STDERR.puts " --> Compiling #{library_name} for the current Ruby interpreter..."
+		STDERR.puts "     (set PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0 to disable)"
+		STDERR.puts "     -------------------------------"
 
 		require 'fileutils'
-		require 'phusion_passenger/platform_info/ruby'
+		require 'shellwords'
+		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		
 		target_dir = compile(installation_target_dirs)
 		if target_dir
-			require "#{target_dir}/#{library_name}"
+			return load_native_extension("#{target_dir}/#{library_name}")
 		else
-			STDERR.puts "Ruby native_support extension not loaded. Continuing without native_support."
 			return false
 		end
 	end
@@ -212,8 +227,8 @@ private
 		if (output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']) && !output_dir.empty?
 			target_dirs << "#{output_dir}/#{VERSION_STRING}/#{archdir}"
 		end
-		if native_support_dir_in_source_root
-			target_dirs << "#{native_support_dir_in_source_root}/#{archdir}"
+		if PhusionPassenger.buildout_dir
+			target_dirs << "#{PhusionPassenger.buildout_dir}/ruby/#{archdir}"
 		end
 		target_dirs << "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
 		return target_dirs
@@ -222,62 +237,49 @@ private
 	def download(name, output_dir)
 		url = "#{PhusionPassenger::BINARIES_URL_ROOT}/#{PhusionPassenger::VERSION_STRING}/#{name}"
 		filename = "#{output_dir}/#{name}"
-		
-		cache_dir = PhusionPassenger.download_cache_dir
-		if File.exist?("#{cache_dir}/#{name}")
-			FileUtils.cp("#{cache_dir}/#{name}", filename, :verbose => true)
-			return true
-		end
-
-		STDERR.puts "Attempting to download #{url} into #{output_dir}"
-		cert = PhusionPassenger.binaries_ca_cert_path
-		File.unlink("#{filename}.tmp") rescue nil
-		if PhusionPassenger::PlatformInfo.find_command("wget")
-			result = system("wget", "--tries=3", "-O", "#{filename}.tmp", "--ca-certificate=#{cert}", url)
-		else
-			result = system("curl", url, "-f", "-L", "-o", "#{filename}.tmp", "--cacert", cert)
-		end
-		if result
-			File.rename("#{filename}.tmp", filename)
-		else
-			File.unlink("#{filename}.tmp") rescue nil
-		end
-		return result
+		logger = Logger.new(STDERR)
+		logger.level = Logger::WARN
+		logger.formatter = proc { |severity, datetime, progname, msg| "     #{msg}\n" }
+		return PhusionPassenger::Utils::Download.download(url, filename,
+			:cacert => PhusionPassenger.binaries_ca_cert_path,
+			:use_cache => true,
+			:logger => logger)
 	end
 	
 	def mkdir(dir)
 		begin
-			STDERR.puts "# mkdir -p #{dir}"
+			STDERR.puts "     # mkdir -p #{dir}"
 			FileUtils.mkdir_p(dir)
 		rescue Errno::EEXIST
 		end
 	end
 	
-	def sh(*args)
-		if !sh_nonfatal(*args)
-			command_string = args.join(' ')
+	def sh(command_string)
+		if !sh_nonfatal(command_string)
 			raise "Could not compile #{library_name} (\"#{command_string}\" failed)"
 		end
 	end
 
-	def sh_nonfatal(*args)
-		command_string = args.join(' ')
-		STDERR.puts "# #{command_string}"
-		return system(*args)
+	def sh_nonfatal(command_string)
+		STDERR.puts "     # #{command_string}"
+		PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |tmpdir|
+			s_tmpdir = Shellwords.escape(tmpdir)
+			result = system("#{command_string} >#{s_tmpdir}/log 2>&1")
+			system("cat #{s_tmpdir}/log | sed 's/^/     /'")
+			return result
+		end
 	end
 	
 	def compile(target_dirs)
 		try_directories(target_dirs) do |target_dir|
 			result =
-				sh_nonfatal("#{PlatformInfo.ruby_command} '#{extconf_rb}'") &&
-				sh_nonfatal("make")
+				sh_nonfatal("#{PlatformInfo.ruby_command} #{Shellwords.escape extconf_rb}") &&
+				sh_nonfatal("make clean && make")
 			if result
-				STDERR.puts "Compilation succesful."
-				STDERR.puts "-------------------------------"
+				STDERR.puts "     Compilation succesful."
 				[target_dir, false]
 			else
-				STDERR.puts "Compilation failed."
-				STDERR.puts "-------------------------------"
+				STDERR.puts "     Compilation failed."
 				[nil, false]
 			end
 		end
@@ -290,7 +292,7 @@ private
 				mkdir(dir)
 				File.open("#{dir}/.permission_test", "w").close
 				File.unlink("#{dir}/.permission_test")
-				STDERR.puts "# cd #{dir}"
+				STDERR.puts "     # cd #{dir}"
 				Dir.chdir(dir) do
 					result, should_retry = yield(dir)
 					return result if !should_retry
@@ -301,33 +303,49 @@ private
 				# error on the last one too then propagate the
 				# exception.
 				if i == dirs.size - 1
-					STDERR.puts "Encountered permission error, " +
+					STDERR.puts "     Encountered permission error, " +
 						"but no more directories to try. Giving up."
-					STDERR.puts "-------------------------------"
+					STDERR.puts "     -------------------------------"
 					return nil
 				else
-					STDERR.puts "Encountered permission error, " +
+					STDERR.puts "     Encountered permission error, " +
 						"trying a different directory..."
-					STDERR.puts "-------------------------------"
+					STDERR.puts "     -------------------------------"
 				end
 			rescue Errno::ENOTDIR
-				# This can occur when PhusionPassenger.source_root
-				# is a location configuration file, and natively_packaged
-				# is set to false. For example, when we're running
-				# in Phusion Passenger Standalone. In this case
-				# just ignore this directory.
+				# This can occur when locations.ini set buildout_dir
+				# to an invalid path. Just ignore this error.
 				if i == dirs.size - 1
-					STDERR.puts "Not a valid directory, " +
+					STDERR.puts "     Not a valid directory, " +
 						"but no more directories to try. Giving up."
-					STDERR.puts "-------------------------------"
+					STDERR.puts "     -------------------------------"
 					return nil
 				else
-					STDERR.puts "Not a valid directory. Trying a different one..."
-					STDERR.puts "-------------------------------"
+					STDERR.puts "     Not a valid directory. Trying a different one..."
+					STDERR.puts "     -------------------------------"
 				end
 			end
 		end
 	end
+
+	def load_native_extension(name_or_filename)
+		# If passenger_native_support.so exited because it detected that it was compiled
+		# for a different Ruby version, then subsequent require("passenger_native_support")
+		# calls will do nothing. So we remove passenger_native_support from $LOADED_FEATURES
+		# to force it to be loaded.
+		$LOADED_FEATURES.reject! { |fn| File.basename(fn) == library_name }
+		begin
+			require(name_or_filename)
+			return defined?(PhusionPassenger::NativeSupport)
+		rescue LoadError => e
+			if e.to_s =~ /dlopen/
+				# Print dlopen failures. We're not interested in any other
+				# kinds of failures, such as file-not-found.
+				puts e.to_s.gsub(/^/, "     ")
+			end
+			return false
+		end
+	end
 end
 
 end # module PhusionPassenger