passenger 2.2.15 → 3.0.0.pre1

data/lib/phusion_passenger/{railz → classic_rails}/request_handler.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  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.
 #
@@ -23,9 +23,9 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger/abstract_request_handler'
-require 'phusion_passenger/railz/cgi_fixed'
+require 'phusion_passenger/classic_rails/cgi_fixed'
 module PhusionPassenger
-module Railz
+module ClassicRails
 
 # A request handler for Ruby on Rails applications.
 class RequestHandler < AbstractRequestHandler
@@ -44,7 +44,8 @@ class RequestHandler < AbstractRequestHandler
 
 protected
 	# Overrided method.
-	def process_request(headers, input, output)
+	def process_request(headers, input, output, status_line_desired)
+		# FIXME: how to print status line?
 		headers[CONTENT_LENGTH] = headers[HTTP_CONTENT_LENGTH]
 		cgi = CGIFixed.new(headers, input, output)
 		::Dispatcher.dispatch(cgi,
@@ -61,13 +62,14 @@ private
 				alias passenger_orig_perform_action perform_action
 				
 				def perform_action(*whatever)
-					headers[X_POWERED_BY] = PASSENGER_HEADER
+					headers[X_POWERED_BY] = @passenger_header
 					passenger_orig_perform_action(*whatever)
 				end
+				private :perform_action
 			end
 		end
 	end
 end
 
-end # module Railz
+end # module ClassicRails
 end # module PhusionPassenger

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_base_extension.rb

@@ -0,0 +1,65 @@
+#  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 ClassicRailsExtensions
+module AnalyticsLogging
+
+module ACBaseExtension
+private
+	def perform_action_with_passenger(*args)
+		# Log controller and action name.
+		log = request.env[PASSENGER_ANALYTICS_WEB_LOG]
+		if log
+			log.begin_measure("framework request processing")
+			begin
+				log.message("Controller action: #{controller_class_name}##{action_name}")
+				perform_action_without_passenger(*args)
+			ensure
+				log.end_measure("framework request processing",
+					request.env["PASSENGER_ACTION_FAILED"])
+			end
+		else
+			perform_action_without_passenger(*args)
+		end
+	end
+	
+protected
+	def render_with_passenger(*args, &block)
+		log = request.env[PASSENGER_ANALYTICS_WEB_LOG]
+		if log
+			log.measure("view rendering") do
+				result = render_without_passenger(*args, &block)
+				view_runtime = @view_runtime || @rendering_runtime
+				log.message "View rendering time: #{(view_runtime * 1000).to_i}"
+				return result
+			end
+		else
+			render_without_passenger(*args, &block)
+		end
+	end
+end
+
+end
+end
+end

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_benchmarking_extension.rb

@@ -0,0 +1,48 @@
+#  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 ClassicRailsExtensions
+module AnalyticsLogging
+
+module ACBenchmarkingExtension
+	def benchmark_with_passenger(title, *args)
+		# Log ActionController benchmarking blocks.
+		log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
+		if log
+			log.measure("BENCHMARK: #{title}") do
+				benchmark_without_passenger(title, *args) do
+					yield
+				end
+			end
+		else
+			benchmark_without_passenger(title, *args) do
+				yield
+			end
+		end
+	end
+end
+
+end
+end
+end

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ac_rescue_extension.rb

@@ -0,0 +1,59 @@
+#  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
+module AnalyticsLogging
+
+module ACRescueExtension
+protected
+	def rescue_action_with_passenger(exception)
+		# When a controller action crashes, log the exception.
+		# But ignore routing errors (404s and stuff).
+		request.env["PASSENGER_ACTION_FAILED"] = true
+		if !defined?(ActionController::RoutingError) || !exception.is_a?(ActionController::RoutingError)
+			AnalyticsLogging.new_transaction_log(request.env, :exceptions) do |log|
+				request_txn_id = request.env[PASSENGER_TXN_ID]
+				message = exception.message
+				message = exception.to_s if message.empty?
+				message = [message].pack('m')
+				message.gsub!("\n", "")
+				backtrace_string = [exception.backtrace.join("\n")].pack('m')
+				backtrace_string.gsub!("\n", "")
+				
+				log.message("Request transaction ID: #{request_txn_id}")
+				log.message("Message: #{message}")
+				log.message("Class: #{exception.class.name}")
+				log.message("Backtrace: #{backtrace_string}")
+				log.message("Controller action: #{controller_class_name}##{action_name}")
+			end
+		end
+		rescue_action_without_passenger(exception)
+	end
+end
+
+end
+end
+end

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/ar_abstract_adapter_extension.rb

@@ -0,0 +1,54 @@
+#  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'
+require 'digest/md5'
+
+module PhusionPassenger
+module ClassicRailsExtensions
+module AnalyticsLogging
+
+module ARAbstractAdapterExtension
+protected
+	def log_with_passenger(sql, name, &block)
+		# Log SQL queries and durations.
+		log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
+		if log
+			if name
+				name = name.strip
+			else
+				name = "SQL"
+			end
+			digest = Digest::MD5.hexdigest("#{name}\0#{sql}\0#{rand}")
+			log.measure("DB BENCHMARK: #{digest}", "#{name}\n#{sql}") do
+				log_without_passenger(sql, name, &block)
+			end
+		else
+			log_without_passenger(sql, name, &block)
+		end
+	end
+end
+
+end
+end
+end

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/as_cache_extension.rb

@@ -0,0 +1,130 @@
+#  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 ClassicRailsExtensions
+module AnalyticsLogging
+
+module CacheStoreExtension
+	def fetch_2_1(key, options = {})
+		@logger_off = true
+		if !options[:force] && value = read(key, options)
+			@logger_off = false
+			log("hit", key, options)
+			PhusionPassenger.log_cache_hit(nil, key)
+			value
+		elsif block_given?
+			@logger_off = false
+			log("miss", key, options)
+
+			value = nil
+			seconds = Benchmark.realtime { value = yield }
+
+			@logger_off = true
+			write(key, value, options)
+			@logger_off = false
+
+			log("write (will save #{'%.5f' % seconds})", key, nil)
+			PhusionPassenger.log_cache_miss(nil, key, seconds * 1_000_000)
+
+			value
+		else
+			PhusionPassenger.log_cache_miss(nil, key)
+			value
+		end
+	end
+	
+	def fetch_2_2(key, options = {})
+		@logger_off = true
+		if !options[:force] && value = read(key, options)
+			@logger_off = false
+			log("hit", key, options)
+			PhusionPassenger.log_cache_hit(nil, key)
+			value
+		elsif block_given?
+			@logger_off = false
+			log("miss", key, options)
+
+			value = nil
+			seconds = Benchmark.realtime { value = yield }
+
+			@logger_off = true
+			write(key, value, options)
+			@logger_off = false
+
+			log("write (will save #{'%.2f' % (seconds * 1000)}ms)", key, nil)
+			PhusionPassenger.log_cache_miss(nil, key, seconds * 1_000_000)
+
+			value
+		else
+			PhusionPassenger.log_cache_miss(nil, key)
+			value
+		end
+	end
+	
+	def fetch_2_3(key, options = {})
+		@logger_off = true
+		if !options[:force] && value = read(key, options)
+			@logger_off = false
+			log("hit", key, options)
+			PhusionPassenger.log_cache_hit(nil, key)
+			value
+		elsif block_given?
+			@logger_off = false
+			log("miss", key, options)
+
+			value = nil
+			ms = Benchmark.ms { value = yield }
+
+			@logger_off = true
+			write(key, value, options)
+			@logger_off = false
+
+			log('write (will save %.2fms)' % ms, key, nil)
+			PhusionPassenger.log_cache_miss(nil, key, ms * 1_000)
+
+			value
+		else
+			PhusionPassenger.log_cache_miss(nil, key)
+			value
+		end
+	end
+end
+
+module ConcreteCacheStoreExtension
+	def read(name, *args)
+		result = super
+		if !@logger_off
+			if result.nil?
+				PhusionPassenger.log_cache_miss(nil, name)
+			else
+				PhusionPassenger.log_cache_hit(nil, name)
+			end
+		end
+		result
+	end
+end
+
+end
+end
+end

data/lib/phusion_passenger/classic_rails_extensions/analytics_logging/av_benchmark_helper_extension.rb

@@ -0,0 +1,47 @@
+#  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 ClassicRailsExtensions
+module AnalyticsLogging
+
+module AVBenchmarkHelperExtension
+	def benchmark_with_passenger(message = "Benchmarking", *args)
+		log = request.env[PASSENGER_ANALYTICS_WEB_LOG]
+		if log
+			log.measure("BENCHMARK: #{message}") do
+				benchmark_without_passenger(message, *args) do |*args2|
+					yield(*args2)
+				end
+			end
+		else
+			benchmark_without_passenger(message, *args) do |*args2|
+				yield(*args2)
+			end
+		end
+	end
+end
+
+end
+end
+end