passenger 2.2.15 → 3.0.0.pre1

data/lib/phusion_passenger/classic_rails_extensions/init.rb

@@ -0,0 +1,123 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2010 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 'phusion_passenger/constants'
+
+module PhusionPassenger
+module ClassicRailsExtensions
+	def self.init!(options)
+		if options["analytics_logger"] && options["analytics"]
+			AnalyticsLogging.install!(options)
+		else
+			# Remove code to save memory.
+			PhusionPassenger.send(:remove_const, :ClassicRailsExtensions)
+		end
+	end
+end
+end
+
+module PhusionPassenger
+module ClassicRailsExtensions
+module AnalyticsLogging
+	# Instantiated from prepare_app_process in utils.rb.
+	@@analytics_logger = nil
+	
+	def self.install!(options)
+		@@analytics_logger = options["analytics_logger"]
+		# If the Ruby interpreter supports GC statistics then turn it on
+		# so that the info can be logged.
+		GC.enable_stats if GC.respond_to?(:enable_stats)
+		
+		if defined?(ActionController)
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/ac_base_extension'
+			ActionController::Base.class_eval do
+				include ACBaseExtension
+				alias_method_chain :perform_action, :passenger
+				alias_method_chain :render, :passenger
+			end
+			
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/ac_benchmarking_extension'
+			ActionController::Benchmarking::ClassMethods.class_eval do
+				include ACBenchmarkingExtension
+				alias_method_chain :benchmark, :passenger
+			end
+			
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/ac_rescue_extension'
+			ActionController::Rescue.class_eval do
+				include ACRescueExtension
+				alias_method_chain :rescue_action, :passenger
+			end
+		end
+		
+		if defined?(ActionView)
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/av_benchmark_helper_extension'
+			ActionView::Helpers::BenchmarkHelper.class_eval do
+				include AVBenchmarkHelperExtension
+				alias_method_chain :benchmark, :passenger
+			end
+		end
+		
+		if defined?(ActiveRecord)
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/ar_abstract_adapter_extension'
+			ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+				include ARAbstractAdapterExtension
+				alias_method_chain :log, :passenger
+			end
+		end
+		
+		if defined?(ActiveSupport::Cache::Store) && Rails.cache
+			require 'phusion_passenger/classic_rails_extensions/analytics_logging/as_cache_extension'
+			ActiveSupport::Cache::Store.class_eval do
+				include CacheStoreExtension
+				case Rails::VERSION::MINOR
+				when 1
+					# Rails 2.1
+					alias_method :fetch, :fetch_2_1
+				when 2
+					# Rails 2.2
+					alias_method :fetch, :fetch_2_2
+				when 3
+					# Rails 2.3
+					alias_method :fetch, :fetch_2_3
+				end
+			end
+			Rails.cache.extend(ConcreteCacheStoreExtension)
+		end
+	end
+	
+	def self.new_transaction_log(env, category = :requests)
+		if env[PASSENGER_TXN_ID]
+			group_name = env[PASSENGER_GROUP_NAME]
+			union_station_key = env[PASSENGER_UNION_STATION_KEY]
+			log = @@analytics_logger.new_transaction(group_name, category,
+				union_station_key)
+			begin
+				yield log
+			ensure
+				log.close
+			end
+		end
+	end
+end
+end
+end

data/lib/phusion_passenger/console_text_template.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #

data/lib/phusion_passenger/constants.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,10 +22,14 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-	# Phusion Passenger version number.
-	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.15'
-	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60
+	
+	ROOT_UID = 0
+	ROOT_GID = 0
+	
+	PASSENGER_ANALYTICS_WEB_LOG = "PASSENGER_ANALYTICS_WEB_LOG"
+	PASSENGER_TXN_ID = "PASSENGER_TXN_ID"
+	PASSENGER_GROUP_NAME = "PASSENGER_GROUP_NAME"
+	PASSENGER_UNION_STATION_KEY = "PASSENGER_UNION_STATION_KEY"
 end

data/lib/phusion_passenger/debug_logging.rb

@@ -0,0 +1,104 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2010 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.
+
+module PhusionPassenger
+
+module DebugLogging
+	# We don't refer to STDERR directly because STDERR's reference might
+	# change during runtime.
+	@@log_level = 0
+	@@log_device = nil
+	@@log_filename = nil
+	@@stderr_evaluator = lambda { STDERR }
+	
+	def self.included(klass)
+		klass.class_eval do
+			private :debug
+			private :trace
+		end
+	end
+	
+	def self.log_level=(level)
+		@@log_level = level
+	end
+	
+	def self.log_file=(filename)
+		if filename && filename.empty?
+			@@log_filename = nil
+		else
+			@@log_filename = filename
+		end
+		@@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
+		else
+			@@stderr_evaluator = lambda { STDERR }
+		end
+	end
+	
+	def error(message)
+		trace(-1, message, 1)
+	end
+	module_function :error
+	
+	def warn(message)
+		trace(0, message, 1)
+	end
+	module_function :warn
+	
+	def debug(message)
+		trace(1, message, 1)
+	end
+	module_function :debug
+	
+	def trace(level, message, nesting_level = 0)
+		if @@log_level >= level
+			if @@log_filename
+				if !@@log_device || @@log_device.closed?
+					@@log_device = File.open(@@log_filename, "a")
+				end
+				output = @@log_device
+			else
+				output = @@stderr_evaluator.call
+			end
+			location = caller[nesting_level].sub(/.*phusion_passenger\//, '')
+			location.sub!(/(.*):.*/, '\1')
+			now = Time.now
+			time_str = now.strftime("%Y-%m-%d %H:%M:%S.")
+			time_str << sprintf("%03d", now.usec / 1000)
+			output.write("[ pid=#{$$} thr=#{Thread.current.object_id} file=#{location} time=#{time_str} ]: #{message}\n")
+			output.flush
+		end
+	end
+	module_function :trace
+end
+
+end

data/lib/phusion_passenger/dependencies.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -21,7 +21,16 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'rbconfig'
+require 'phusion_passenger'
+require 'phusion_passenger/packaging'
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/apache'
+require 'phusion_passenger/platform_info/ruby'
+require 'phusion_passenger/platform_info/linux'
+require 'phusion_passenger/platform_info/curl'
+require 'phusion_passenger/platform_info/documentation_tools'
+
 module PhusionPassenger
 
 # Represents a dependency software that Passenger requires. It's used by the
@@ -100,6 +109,14 @@ module Dependencies # :nodoc: all
 	def self.fastthread_required?
 		return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
 	end
+	
+	# Returns whether asciidoc is required in order to be able to package all files
+	# in the packaging list.
+	def self.asciidoc_required?
+		return Packaging::ASCII_DOCS.any? do |fn|
+			!File.exist?("#{SOURCE_ROOT}/#{fn}")
+		end
+	end
 
 	GCC = Dependency.new do |dep|
 		dep.name = "GNU C++ compiler"
@@ -128,6 +145,56 @@ module Dependencies # :nodoc: all
 		dep.website = "http://gcc.gnu.org/"
 	end
 	
+	Make = Dependency.new do |dep|
+		dep.name = "The 'make' tool"
+		dep.define_checker do |result|
+			make = PlatformInfo.find_command('make')
+			if make
+				result.found(make)
+			else
+				result.not_found
+			end
+		end
+		if RUBY_PLATFORM =~ /linux/
+			case PlatformInfo.linux_distro
+			when :ubuntu, :debian
+				dep.install_command = "apt-get install build-essential"
+			when :rhel, :fedora, :centos
+				dep.install_command = "yum install make"
+			end
+		elsif RUBY_PLATFORM =~ /darwin/
+			dep.install_instructions = "Please install the Apple Development Tools: http://developer.apple.com/tools/"
+		end
+		dep.website = "http://www.gnu.org/software/make/"
+	end
+	
+	DownloadTool = Dependency.new do |dep|
+		dep.name = "A download tool like 'wget' or 'curl'"
+		dep.define_checker do |result|
+			tool = PlatformInfo.find_command('wget')
+			if tool
+				result.found(tool)
+			else
+				tool = PlatformInfo.find_command('curl')
+				if tool
+					result.found(tool)
+				else
+					result.not_found
+				end
+			end
+		end
+		if RUBY_PLATFORM =~ /linux/
+			case PlatformInfo.linux_distro
+			when :ubuntu, :debian
+				dep.install_command = "apt-get install wget curl"
+			when :rhel, :fedora, :centos
+				dep.install_command = "yum install wget curl"
+			end
+		else
+			dep.install_instructions = "Please install either wget (http://www.gnu.org/software/wget/) or curl (http://curl.haxx.se/)."
+		end
+	end
+	
 	Ruby_DevHeaders = Dependency.new do |dep|
 		dep.name = "Ruby development headers"
 		dep.define_checker do |result|
@@ -209,7 +276,7 @@ module Dependencies # :nodoc: all
 			end
 		end
 		dep.website = "http://rake.rubyforge.org/"
-		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM || "gem"} install rake</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install rake</b>"
 	end
 	
 	Apache2 = Dependency.new do |dep|
@@ -337,7 +404,7 @@ module Dependencies # :nodoc: all
 				result.not_found
 			end
 		end
-		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM || "gem"} install fastthread</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install fastthread</b>"
 	end
 
 	Rack = Dependency.new do |dep|
@@ -354,7 +421,55 @@ module Dependencies # :nodoc: all
 				result.not_found
 			end
 		end
-		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM || "gem"} install rack</b>"
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install rack</b>"
+	end
+	
+	Curl_Dev = Dependency.new do |dep|
+		dep.name = "Curl development headers with SSL support"
+		dep.define_checker do |result|
+			source_file = '/tmp/passenger-curl-check.c'
+			output_file = '/tmp/passenger-curl-check'
+			begin
+				found = true
+				File.open(source_file, 'w') do |f|
+					f.puts("#include <curl/curl.h>")
+					f.puts("int main() {")
+					f.puts("  curl_global_init(CURL_GLOBAL_ALL);")
+					f.puts("  return 0;")
+					f.puts("}")
+				end
+				Dir.chdir(File.dirname(source_file)) do
+					command = "(gcc #{ENV['CFLAGS']} " +
+						"-o '#{output_file}' '#{source_file}' " +
+						"#{PlatformInfo.curl_flags} #{PlatformInfo.curl_libs}) " +
+						">/dev/null 2>/dev/null"
+					if !system(command)
+						found = false
+					end
+				end
+				
+				if found && !PlatformInfo.curl_supports_ssl?
+					dep.install_comments = "Curl was found, but it doesn't support SSL."
+					found = false
+				end
+				result.found(found)
+			ensure
+				File.unlink(source_file) rescue nil
+				File.unlink(output_file) rescue nil
+			end
+		end
+		dep.install_instructions = "Please download Curl from <b>http://curl.haxx.se/libcurl</b> " +
+			"and make sure you install it <b>with SSL support</b>."
+		if RUBY_PLATFORM =~ /linux/
+			tags = PlatformInfo.linux_distro_tags
+			if tags.include?(:debian)
+				dep.install_instructions = "Please run " +
+					"<b>apt-get install libcurl4-openssl-dev</b> " +
+					"or <b>libcurl4-gnutls-dev</b>, whichever you prefer."
+			elsif tags.include?(:redhat)
+				dep.install_command = "yum install curl-devel"
+			end
+		end
 	end
 	
 	OpenSSL_Dev = Dependency.new do |dep|
@@ -420,6 +535,74 @@ module Dependencies # :nodoc: all
 		end
 		dep.website = "http://www.zlib.net/"
 	end
+	
+	File_Tail = Dependency.new do |dep|
+		dep.name = "file-tail"
+		dep.define_checker do |result|
+			begin
+				begin
+					require 'rubygems'
+				rescue LoadError
+				end
+				require 'file/tail'
+				result.found
+			rescue LoadError
+				result.not_found
+			end
+		end
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install file-tail</b>"
+	end
+	
+	Daemon_Controller = Dependency.new do |dep|
+		dep.name = "daemon_controller >= 0.2.5"
+		dep.install_instructions = "Please install RubyGems first, then run " <<
+			"<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>"
+		dep.define_checker do |result|
+			begin
+				begin
+					require 'rubygems'
+				rescue LoadError
+				end
+				require 'daemon_controller'
+				begin
+					require 'daemon_controller/version'
+					too_old = DaemonController::VERSION_STRING < '0.2.5'
+				rescue LoadError
+					too_old = true
+				end
+				if too_old
+					result.not_found
+					dep.install_instructions = "Your version of daemon_controller is too old. " <<
+						"Please upgrade with the following commands:\n" <<
+						"   <b>#{PlatformInfo.gem_command || "gem"} uninstall FooBarWidget-daemon_controller</b>\n" <<
+						"   <b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>"
+				else
+					result.found
+				end
+			rescue LoadError
+				result.not_found
+			end
+		end
+	end
+	
+	AsciiDoc = Dependency.new do |dep|
+		dep.name = "Asciidoc"
+		dep.define_checker do |result|
+			if PlatformInfo.asciidoc.nil?
+				result.not_found
+			else
+				result.found(PlatformInfo.asciidoc)
+			end
+		end
+		if RUBY_PLATFORM =~ /darwin/
+			# Installing asciidoc with source-highlight is too much of a pain on OS X,
+			# so recommend Mizuho instead.
+			dep.website = "http://github.com/FooBarWidget/mizuho"
+			dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>"
+		else
+			dep.website = "http://www.methods.co.nz/asciidoc/"
+		end
+	end
 end
 
 end # module PhusionPassenger