passenger 4.0.60 → 5.0.0.beta1

data/lib/phusion_passenger/debug_logging.rb

@@ -21,16 +21,18 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+PhusionPassenger.require_passenger_lib 'constants'
+
 module PhusionPassenger
 
 module DebugLogging
 	# We don't refer to STDERR directly because STDERR's reference might
 	# change during runtime.
-	@@log_level = 0
+	@@log_level = DEFAULT_LOG_LEVEL
 	@@log_device = nil
 	@@log_filename = nil
 	@@stderr_evaluator = lambda { STDERR }
-	
+
 	def self.included(klass)
 		klass.class_eval do
 			private :debug
@@ -41,11 +43,11 @@ module DebugLogging
 	def self.log_level
 		return @@log_level
 	end
-	
+
 	def self.log_level=(level)
 		@@log_level = level
 	end
-	
+
 	def self.log_file=(filename)
 		if filename && filename.empty?
 			@@log_filename = nil
@@ -55,11 +57,11 @@ module DebugLogging
 		@@log_device.close if @@log_device && !@@log_device.closed?
 		@@log_device = nil
 	end
-	
+
 	def self._log_device
 		return @@log_device
 	end
-	
+
 	def self.stderr_evaluator=(block)
 		if block
 			@@stderr_evaluator = block
@@ -67,23 +69,38 @@ module DebugLogging
 			@@stderr_evaluator = lambda { STDERR }
 		end
 	end
-	
+
 	def error(message)
-		trace(-1, message, 1)
+		_output(1, message, 1)
 	end
 	module_function :error
-	
+
 	def warn(message)
-		trace(0, message, 1)
+		_output(2, message, 1)
 	end
 	module_function :warn
-	
+
+	def notice(message)
+		_output(3, message, 1)
+	end
+	module_function :notice
+
+	def info(message)
+		_output(4, message, 1)
+	end
+	module_function :info
+
 	def debug(message)
-		trace(1, message, 1)
+		_output(5, message, 1)
 	end
 	module_function :debug
-	
-	def trace(level, message, nesting_level = 0)
+
+	def trace(level, message)
+		_output(4 + level, message, 1)
+	end
+	module_function :trace
+
+	def _output(level, message, nesting_level = 0)
 		if @@log_level >= level
 			if @@log_filename
 				if !@@log_device || @@log_device.closed?
@@ -112,7 +129,7 @@ module DebugLogging
 			output.flush
 		end
 	end
-	module_function :trace
+	module_function :_output
 end
 
 end

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -168,7 +168,7 @@ module LoaderSharedHelpers
 			# because the one in the source root may not exist.
 			command = [
 				"env",
-				"PASSENGER_LOCATION_CONFIGURATION_FILE=#{PhusionPassenger.source_root}",
+				"PASSENGER_LOCATION_CONFIGURATION_FILE=#{PhusionPassenger.install_spec}",
 				"#{PhusionPassenger.bin_dir}/passenger-config",
 				"system-metrics"
 			]
@@ -458,10 +458,7 @@ private
 	end
 
 	def home_dir
-		@home_dir ||= begin
-			require 'etc' if !defined?(Etc)
-			Etc.getpwuid(Process.uid).dir
-		end
+		return PhusionPassenger.home_dir
 	end
 end
 

data/lib/phusion_passenger/message_client.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -25,7 +25,6 @@
 require 'socket'
 PhusionPassenger.require_passenger_lib 'message_channel'
 PhusionPassenger.require_passenger_lib 'utils'
-PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 
 module PhusionPassenger
 
@@ -33,14 +32,14 @@ module PhusionPassenger
 # for example the ApplicationPool server.
 class MessageClient
 	include Utils
-	
+
 	# Connect to the given server. By default it connects to the current
 	# generation's helper server.
-	def initialize(username, password, address = "unix:#{Utils.passenger_tmpdir}/socket")
+	def initialize(username, password, address)
 		@socket = connect_to_server(address)
 		begin
 			@channel = MessageChannel.new(@socket)
-			
+
 			result = @channel.read
 			if result.nil?
 				raise EOFError
@@ -49,10 +48,10 @@ class MessageClient
 			elsif result[1] != "1"
 				raise IOError, "Unsupported message server protocol version #{result[1]}"
 			end
-			
+
 			@channel.write_scalar(username)
 			@channel.write_scalar(password)
-		
+
 			result = @channel.read
 			if result.nil?
 				raise EOFError
@@ -64,18 +63,18 @@ class MessageClient
 			raise
 		end
 	end
-	
+
 	def close
 		@socket.close if @socket
 		@channel = @socket = nil
 	end
-	
+
 	def connected?
 		return !!@channel
 	end
-	
+
 	### HelperAgent methods ###
-	
+
 	def pool_detach_process(pid)
 		write("detach_process", pid)
 		check_security_response
@@ -97,7 +96,7 @@ class MessageClient
 			return result.first == "true"
 		end
 	end
-	
+
 	def pool_status(options = {})
 		write("inspect", *options.to_a.flatten)
 		check_security_response
@@ -106,7 +105,7 @@ class MessageClient
 		auto_disconnect
 		raise
 	end
-	
+
 	def pool_xml
 		write("toXml", true)
 		check_security_response
@@ -131,7 +130,7 @@ class MessageClient
 	end
 
 	### HelperAgent BacktracesServer methods ###
-	
+
 	def helper_agent_backtraces
 		write("backtraces")
 		check_security_response
@@ -139,50 +138,50 @@ class MessageClient
 	end
 
 	### LoggingAgent AdminServer methods ###
-	
+
 	def logging_agent_status
 		write("status")
 		check_security_response
 		return read_scalar
 	end
-	
+
 	### Low level I/O methods ###
-	
+
 	def read
 		return @channel.read
 	rescue
 		auto_disconnect
 		raise
 	end
-	
+
 	def write(*args)
 		@channel.write(*args)
 	rescue
 		auto_disconnect
 		raise
 	end
-	
+
 	def write_scalar(*args)
 		@channel.write_scalar(*args)
 	rescue
 		auto_disconnect
 		raise
 	end
-	
+
 	def read_scalar
 		return @channel.read_scalar
 	rescue
 		auto_disconnect
 		raise
 	end
-	
+
 	def recv_io(klass = IO, negotiate = true)
 		return @channel.recv_io(klass, negotiate)
 	rescue
 		auto_disconnect
 		raise
 	end
-	
+
 	def check_security_response
 		begin
 			result = @channel.read

data/lib/phusion_passenger/native_support.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,6 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+PhusionPassenger.require_passenger_lib 'constants'
+
 module PhusionPassenger
 
 class NativeSupportLoader
@@ -38,7 +40,7 @@ class NativeSupportLoader
 			load_from_home_dir
 		end
 	end
-	
+
 	def start
 		if ENV['PASSENGER_USE_RUBY_NATIVE_SUPPORT'] == '0'
 			STDERR.puts " --> Continuing without #{library_name}."
@@ -62,29 +64,22 @@ private
 			PlatformInfo.ruby_extension_binary_compatibility_id
 		end
 	end
-	
+
 	def libext
 		@libext ||= begin
 			PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 			PlatformInfo.library_extension
 		end
 	end
-	
-	def home
-		@home ||= begin
-			require 'etc' if !defined?(Etc)
-			home = Etc.getpwuid(Process.uid).dir
-		end
-	end
-	
+
 	def library_name
 		return "passenger_native_support.#{libext}"
 	end
-	
+
 	def extconf_rb
 		File.join(PhusionPassenger.ruby_extension_source_dir, "extconf.rb")
 	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
@@ -99,11 +94,11 @@ private
 			return false
 		end
 	end
-	
+
 	def load_from_buildout_dir
-		if PhusionPassenger.buildout_dir
+		if PhusionPassenger.build_system_dir
 			begin
-				return load_native_extension("#{PhusionPassenger.buildout_dir}/ruby/#{archdir}/#{library_name}")
+				return load_native_extension("#{PhusionPassenger.build_system_dir}/buildout/ruby/#{archdir}/#{library_name}")
 			rescue LoadError
 				return false
 			end
@@ -111,16 +106,16 @@ private
 			return false
 		end
 	end
-	
+
 	def load_from_load_path
 		return load_native_extension('passenger_native_support')
 	rescue LoadError
 		return false
 	end
-	
+
 	def load_from_home_dir
 		begin
-			return load_native_extension("#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}")
+			return load_native_extension("#{PhusionPassenger.home_dir}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}")
 		rescue LoadError
 			return false
 		end
@@ -137,7 +132,7 @@ private
 
 		STDERR.puts " --> Downloading precompiled #{library_name} for the current Ruby interpreter..."
 		STDERR.puts "     (set PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY=0 to disable)"
-		
+
 		require 'logger'
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		PhusionPassenger.require_passenger_lib 'utils/tmpio'
@@ -192,10 +187,10 @@ private
 			return false
 		end
 
-		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.ruby_extension_source_dir)
+		if PhusionPassenger.custom_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
+			case PhusionPassenger.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}'"
@@ -206,7 +201,7 @@ private
 				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."
+				STDERR.puts "     first. Please ask your packager or operating system vendor for instructions."
 			end
 			return false
 		end
@@ -217,7 +212,7 @@ private
 		require 'fileutils'
 		PhusionPassenger.require_passenger_lib 'utils/shellwords'
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-		
+
 		target_dir = compile(installation_target_dirs)
 		if target_dir
 			return load_native_extension("#{target_dir}/#{library_name}")
@@ -231,10 +226,10 @@ private
 		if (output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']) && !output_dir.empty?
 			target_dirs << "#{output_dir}/#{VERSION_STRING}/#{archdir}"
 		end
-		if PhusionPassenger.buildout_dir
-			target_dirs << "#{PhusionPassenger.buildout_dir}/ruby/#{archdir}"
+		if PhusionPassenger.build_system_dir
+			target_dirs << "#{PhusionPassenger.build_system_dir}/buildout/ruby/#{archdir}"
 		end
-		target_dirs << "#{home}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
+		target_dirs << "#{PhusionPassenger.home_dir}/#{USER_NAMESPACE_DIRNAME}/native_support/#{VERSION_STRING}/#{archdir}"
 		return target_dirs
 	end
 
@@ -266,7 +261,7 @@ private
 		)
 		return PhusionPassenger::Utils::Download.download(url, filename, real_options)
 	end
-	
+
 	def log(message, options = {})
 		if logger = options[:logger]
 			logger.puts(message)
@@ -282,7 +277,7 @@ private
 		rescue Errno::EEXIST
 		end
 	end
-	
+
 	def sh(command_string)
 		if !sh_nonfatal(command_string)
 			raise "Could not compile #{library_name} (\"#{command_string}\" failed)"
@@ -303,7 +298,7 @@ private
 			end
 		end
 	end
-	
+
 	def compile(target_dirs)
 		logger = Utils::TmpIO.new('passenger_native_support',
 			:mode   => File::WRONLY | File::APPEND,
@@ -362,7 +357,7 @@ private
 					log("-------------------------------", options)
 				end
 			rescue Errno::ENOTDIR
-				# This can occur when locations.ini set buildout_dir
+				# This can occur when locations.ini set build_system_dir
 				# to an invalid path. Just ignore this error.
 				if i == dirs.size - 1
 					log("Not a valid directory, " +