passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/active_support3_extensions/init.rb

@@ -26,175 +26,173 @@ require 'digest/md5'
 
 module PhusionPassenger
 
-module ActiveSupport3Extensions
-	def self.init!(options, user_options = {})
-		if !UnionStationExtension.install!(options, user_options)
-			# Remove code to save memory.
-			PhusionPassenger::ActiveSupport3Extensions.send(:remove_const, :UnionStationExtension)
-			PhusionPassenger.send(:remove_const, :ActiveSupport3Extensions)
-		end
-	end
-end
-
-module ActiveSupport3Extensions
-class UnionStationExtension < ActiveSupport::LogSubscriber
-	def self.install!(options, user_options)
-		union_station_core = options["union_station_core"]
-		app_group_name = options["app_group_name"]
-		return false if !union_station_core || !options["analytics"]
-		
-		# 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)
-		
-		subscriber = self.new(user_options)
-		UnionStationExtension.attach_to(:action_controller, subscriber)
-		UnionStationExtension.attach_to(:active_record, subscriber)
-		if defined?(ActiveSupport::Cache::Store)
-			ActiveSupport::Cache::Store.instrument = true
-			UnionStationExtension.attach_to(:active_support, subscriber)
-		end
-		PhusionPassenger.on_event(:starting_request_handler_thread) do
-			if defined?(ActiveSupport::Cache::Store)
-				# This flag is thread-local.
-				ActiveSupport::Cache::Store.instrument = true
-			end
-		end
-		
-		if defined?(ActionDispatch::DebugExceptions)
-			exceptions_middleware = ActionDispatch::DebugExceptions
-		elsif defined?(ActionDispatch::ShowExceptions)
-			exceptions_middleware = ActionDispatch::ShowExceptions
-		end
-		if exceptions_middleware
-			if defined?(Rails)
-				Rails.application.middleware.insert_after(
-					exceptions_middleware,
-					ExceptionLogger,
-					union_station_core,
-					app_group_name)
-			end
-		end
-		
-		if defined?(ActionController::Base)
-			ActionController::Base.class_eval do
-				include ACExtension
-			end
-		end
-		
-		if defined?(ActiveSupport::Benchmarkable)
-			ActiveSupport::Benchmarkable.class_eval do
-				include ASBenchmarkableExtension
-				alias_method_chain :benchmark, :passenger
-			end
-		end
-		
-		return true
-	end
-
-	def initialize(options)
-		super()
-		install_event_preprocessor(options[:event_preprocessor]) if options[:event_preprocessor]
-	end
-	
-	def process_action(event)
-		view_runtime = event.payload[:view_runtime]
-		if view_runtime
-			PhusionPassenger.log_total_view_rendering_time(nil, (view_runtime * 1000).to_i)
-		end
-	end
-	
-	def sql(event)
-		PhusionPassenger.log_database_query(nil,
-			event.payload[:name] || "SQL",
-			event.time,
-			event.end,
-			event.payload[:sql])
-	end
-	
-	def cache_read(event)
-		if event.payload[:hit]
-			PhusionPassenger.log_cache_hit(nil, event.payload[:key])
-		else
-			PhusionPassenger.log_cache_miss(nil, event.payload[:key])
-		end
-	end
-	
-	def cache_fetch_hit(event)
-		PhusionPassenger.log_cache_hit(nil, event.payload[:key])
-	end
-	
-	def cache_generate(event)
-		PhusionPassenger.log_cache_miss(nil, event.payload[:key],
-			event.duration * 1000)
-	end
-	
-	class ExceptionLogger
-		def initialize(app, union_station_core, app_group_name)
-			@app = app
-			@union_station_core = union_station_core
-			@app_group_name = app_group_name
-		end
-		
-		def call(env)
-			@app.call(env)
-		rescue Exception => e
-			log_union_station_exception(env, e) if env[PASSENGER_TXN_ID]
-			raise e
-		end
-	
-	private
-		def log_union_station_exception(env, exception)
-			options = {}
-			request = ActionDispatch::Request.new(env)
-			if request.parameters['controller']
-				options[:controller_name] = request.parameters['controller'].humanize + "Controller"
-				options[:action_name] = request.parameters['action']
-			end
-			PhusionPassenger.log_request_exception(env, exception, options)
-		end
-	end
-	
-	module ACExtension
-		def process_action(action, *args)
-			options = {
-				:controller_name => self.class.name,
-				:action_name => action_name,
-				:method => request.request_method
-			}
-			PhusionPassenger.log_controller_action(request.env, options) do
-				super
-			end
-		end
-		
-		def render(*args)
-			PhusionPassenger.log_view_rendering(request.env) do
-				super
-			end
-		end
-	end
-	
-	module ASBenchmarkableExtension
-		def benchmark_with_passenger(message = "Benchmarking", *args)
-			PhusionPassenger.benchmark(nil, message) do
-				benchmark_without_passenger(message, *args) do
-					yield
-				end
-			end
-		end
-	end
-
-private
-	def install_event_preprocessor(event_preprocessor)
-		public_methods(false).each do |name|
-			singleton = class << self; self end
-			singleton.send(:define_method, name, lambda do |event|
-				event_preprocessor.call(event)
-				super(event)
-			end)
-		end
-	end
-end # class UnionStationExtension
-end # module ActiveSupport3Extensions
+  module ActiveSupport3Extensions
+    def self.init!(options, user_options = {})
+      if !UnionStationExtension.install!(options, user_options)
+        # Remove code to save memory.
+        PhusionPassenger::ActiveSupport3Extensions.send(:remove_const, :UnionStationExtension)
+        PhusionPassenger.send(:remove_const, :ActiveSupport3Extensions)
+      end
+    end
+
+    class UnionStationExtension < ActiveSupport::LogSubscriber
+      def self.install!(options, user_options)
+        union_station_core = options["union_station_core"]
+        app_group_name = options["app_group_name"]
+        return false if !union_station_core || !options["analytics"]
+
+        # 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)
+
+        subscriber = self.new(user_options)
+        UnionStationExtension.attach_to(:action_controller, subscriber)
+        UnionStationExtension.attach_to(:active_record, subscriber)
+        if defined?(ActiveSupport::Cache::Store)
+          ActiveSupport::Cache::Store.instrument = true
+          UnionStationExtension.attach_to(:active_support, subscriber)
+        end
+        PhusionPassenger.on_event(:starting_request_handler_thread) do
+          if defined?(ActiveSupport::Cache::Store)
+            # This flag is thread-local.
+            ActiveSupport::Cache::Store.instrument = true
+          end
+        end
+
+        if defined?(ActionDispatch::DebugExceptions)
+          exceptions_middleware = ActionDispatch::DebugExceptions
+        elsif defined?(ActionDispatch::ShowExceptions)
+          exceptions_middleware = ActionDispatch::ShowExceptions
+        end
+        if exceptions_middleware
+          if defined?(Rails)
+            Rails.application.middleware.insert_after(
+              exceptions_middleware,
+              ExceptionLogger,
+              union_station_core,
+              app_group_name)
+          end
+        end
+
+        if defined?(ActionController::Base)
+          ActionController::Base.class_eval do
+            include ACExtension
+          end
+        end
+
+        if defined?(ActiveSupport::Benchmarkable)
+          ActiveSupport::Benchmarkable.class_eval do
+            include ASBenchmarkableExtension
+            alias_method_chain :benchmark, :passenger
+          end
+        end
+
+        return true
+      end
+
+      def initialize(options)
+        super()
+        install_event_preprocessor(options[:event_preprocessor]) if options[:event_preprocessor]
+      end
+
+      def process_action(event)
+        view_runtime = event.payload[:view_runtime]
+        if view_runtime
+          PhusionPassenger.log_total_view_rendering_time(nil, (view_runtime * 1000).to_i)
+        end
+      end
+
+      def sql(event)
+        PhusionPassenger.log_database_query(nil,
+          event.payload[:name] || "SQL",
+          event.time,
+          event.end,
+          event.payload[:sql])
+      end
+
+      def cache_read(event)
+        if event.payload[:hit]
+          PhusionPassenger.log_cache_hit(nil, event.payload[:key])
+        else
+          PhusionPassenger.log_cache_miss(nil, event.payload[:key])
+        end
+      end
+
+      def cache_fetch_hit(event)
+        PhusionPassenger.log_cache_hit(nil, event.payload[:key])
+      end
+
+      def cache_generate(event)
+        PhusionPassenger.log_cache_miss(nil, event.payload[:key],
+          event.duration * 1000)
+      end
+
+      class ExceptionLogger
+        def initialize(app, union_station_core, app_group_name)
+          @app = app
+          @union_station_core = union_station_core
+          @app_group_name = app_group_name
+        end
+
+        def call(env)
+          @app.call(env)
+        rescue Exception => e
+          log_union_station_exception(env, e) if env[PASSENGER_TXN_ID]
+          raise e
+        end
+
+      private
+        def log_union_station_exception(env, exception)
+          options = {}
+          request = ActionDispatch::Request.new(env)
+          if request.parameters['controller']
+            options[:controller_name] = request.parameters['controller'].humanize + "Controller"
+            options[:action_name] = request.parameters['action']
+          end
+          PhusionPassenger.log_request_exception(env, exception, options)
+        end
+      end
+
+      module ACExtension
+        def process_action(action, *args)
+          options = {
+            :controller_name => self.class.name,
+            :action_name => action_name,
+            :method => request.request_method
+          }
+          PhusionPassenger.log_controller_action(request.env, options) do
+            super
+          end
+        end
+
+        def render(*args)
+          PhusionPassenger.log_view_rendering(request.env) do
+            super
+          end
+        end
+      end
+
+      module ASBenchmarkableExtension
+        def benchmark_with_passenger(message = "Benchmarking", *args)
+          PhusionPassenger.benchmark(nil, message) do
+            benchmark_without_passenger(message, *args) do
+              yield
+            end
+          end
+        end
+      end
+
+    private
+      def install_event_preprocessor(event_preprocessor)
+        public_methods(false).each do |name|
+          singleton = class << self; self end
+          singleton.send(:define_method, name, lambda do |event|
+            event_preprocessor.call(event)
+            super(event)
+          end)
+        end
+      end
+    end # class UnionStationExtension
+  end # module ActiveSupport3Extensions
 
 end # module PhusionPassenger

data/lib/phusion_passenger/admin_tools.rb

@@ -23,26 +23,26 @@
 
 module PhusionPassenger
 
-module AdminTools
-	def self.tmpdir
-		["PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR"].each do |name|
-			if ENV.has_key?(name) && !ENV[name].empty?
-				return ENV[name]
-			end
-		end
-		return "/tmp"
-	end
+  module AdminTools
+    def self.tmpdir
+      ["PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR"].each do |name|
+        if ENV.has_key?(name) && !ENV[name].empty?
+          return ENV[name]
+        end
+      end
+      return "/tmp"
+    end
 
-	def self.process_is_alive?(pid)
-		begin
-			Process.kill(0, pid)
-			return true
-		rescue Errno::ESRCH
-			return false
-		rescue SystemCallError => e
-			return true
-		end
-	end
-end # module AdminTools
+    def self.process_is_alive?(pid)
+      begin
+        Process.kill(0, pid)
+        return true
+      rescue Errno::ESRCH
+        return false
+      rescue SystemCallError => e
+        return true
+      end
+    end
+  end # module AdminTools
 
 end # module PhusionPassenger

data/lib/phusion_passenger/admin_tools/instance.rb

@@ -26,182 +26,182 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module AdminTools
-
-class Instance
-	STALE_TIMEOUT = 60
-
-	attr_reader :path, :state, :name, :server_software, :properties
-
-	def initialize(path)
-		@path = path
-		# Possible states:
-		#
-		# * :good - Everything is good. But the Watchdog process that created
-		#   it might have died. In that case, the directory should be cleaned up.
-		#   Use `locked?` to check.
-		#
-		# * :not_finalized - The instance directory hasn't been finalized yet,
-		#   so we can't read any information from it. It is possible that the
-		#   process that has created it has died, i.e. that it will never
-		#   become finalized. In that case, the directory should be cleaned up.
-		#   Use `stale?` to check.
-		#
-		# * :structure_version_unsupported - The properties file advertised a
-		#   structure version that we don't support. We can't read any
-		#   information from it.
-		#
-		# * :corrupted - The instance directory is corrupted in some way.
-		@state = nil
-
-		reload_properties
-	end
-
-	def locked?
-		if defined?(File::LOCK_EX)
-			return !File.open("#{@path}/lock", "r") do |f|
-				f.flock(File::LOCK_EX | File::LOCK_NB)
-			end
-		else
-			# Solaris :-(
-			# Since using fcntl locks in Ruby is a huge pain,
-			# we'll fallback to checking the watchdog PID.
-			return watchdog_alive?
-		end
-	end
-
-	def stale?
-		stat = File.stat(@path)
-		if stat.mtime < Time.now - STALE_TIMEOUT
-			return !locked?
-		else
-			return false
-		end
-	end
-
-	def watchdog_alive?
-		return process_is_alive?(@watchdog_pid)
-	end
-
-	def http_request(socket_path, request)
-		sock = Net::BufferedIO.new(UNIXSocket.new("#{@path}/#{socket_path}"))
-		begin
-			request.exec(sock, "1.1", request.path)
-
-			done = false
-			while !done
-				response = Net::HTTPResponse.read_new(sock)
-				done = !response.kind_of?(Net::HTTPContinue)
-			end
-
-			response.reading_body(sock, request.response_body_permitted?) do
-				# Nothing
-			end
-		ensure
-			sock.close
-		end
-
-		return response
-	end
-
-	def server_pid
-		@server_pid ||= File.read("#{@path}/server.pid").to_i
-	end
-
-	def full_admin_password
-		@full_admin_password ||= File.read("#{@path}/full_admin_password.txt")
-	end
-
-	def read_only_admin_password
-		@read_only_admin_password ||= File.read("#{@path}/read_only_admin_password.txt")
-	end
-
-private
-	class CorruptedError < StandardError
-	end
-
-	def reload_properties
-		@properties = nil
-		@state      = nil
-		begin
-			reload_properties_internal
-		rescue CorruptedError
-			@state = :corrupted
-		end
-	end
-
-	def reload_properties_internal
-		if !File.exist?("#{@path}/creation_finalized")
-			@state = :unfinalized
-			return
-		end
-		check(File.file?("#{@path}/creation_finalized"))
-
-		properties = nil
-		begin
-			File.open("#{@path}/properties.json", "r") do |f|
-				properties = Utils::JSON.parse(f.read)
-			end
-		rescue Errno::ENOENT
-			raise CorruptedError
-		rescue RuntimeError => e
-			if e.message =~ /parse error/
-				raise CorruptedError
-			else
-				raise
-			end
-		end
-
-		check(!properties.nil?)
-		props = properties["instance_dir"]
-		check(!props.nil?)
-		major_version = props["major_version"]
-		minor_version = props["minor_version"]
-		check(major_version.is_a?(Integer))
-		check(minor_version.is_a?(Integer))
-		name = properties["name"]
-		check(name.is_a?(String))
-		check(!name.empty?)
-		server_software = properties["server_software"]
-		check(server_software.is_a?(String))
-		check(!server_software.empty?)
-		watchdog_pid = properties["watchdog_pid"]
-		check(watchdog_pid.is_a?(Integer))
-
-		version_supported =
-			major_version == PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION &&
-			minor_version <= PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
-		if !version_supported
-			@state = :structure_version_unsupported
-			return
-		end
-
-		check(File.file?("#{@path}/lock"))
-		check(File.directory?("#{@path}/agents.s"))
-		check(File.directory?("#{@path}/apps.s"))
-
-		@properties = properties
-		@name = name
-		@server_software = server_software
-		@watchdog_pid = watchdog_pid
-		@state = :good
-	end
-
-	def check(val)
-		raise CorruptedError if !val
-	end
-
-	def process_is_alive?(pid)
-		begin
-			Process.kill(0, pid)
-			return true
-		rescue Errno::ESRCH
-			return false
-		rescue SystemCallError => e
-			return true
-		end
-	end
-end
-
-end # module AdminTools
+  module AdminTools
+
+    class Instance
+      STALE_TIMEOUT = 60
+
+      attr_reader :path, :state, :name, :server_software, :properties
+
+      def initialize(path)
+        @path = path
+        # Possible states:
+        #
+        # * :good - Everything is good. But the Watchdog process that created
+        #   it might have died. In that case, the directory should be cleaned up.
+        #   Use `locked?` to check.
+        #
+        # * :not_finalized - The instance directory hasn't been finalized yet,
+        #   so we can't read any information from it. It is possible that the
+        #   process that has created it has died, i.e. that it will never
+        #   become finalized. In that case, the directory should be cleaned up.
+        #   Use `stale?` to check.
+        #
+        # * :structure_version_unsupported - The properties file advertised a
+        #   structure version that we don't support. We can't read any
+        #   information from it.
+        #
+        # * :corrupted - The instance directory is corrupted in some way.
+        @state = nil
+
+        reload_properties
+      end
+
+      def locked?
+        if defined?(File::LOCK_EX)
+          return !File.open("#{@path}/lock", "r") do |f|
+            f.flock(File::LOCK_EX | File::LOCK_NB)
+          end
+        else
+          # Solaris :-(
+          # Since using fcntl locks in Ruby is a huge pain,
+          # we'll fallback to checking the watchdog PID.
+          return watchdog_alive?
+        end
+      end
+
+      def stale?
+        stat = File.stat(@path)
+        if stat.mtime < Time.now - STALE_TIMEOUT
+          return !locked?
+        else
+          return false
+        end
+      end
+
+      def watchdog_alive?
+        return process_is_alive?(@watchdog_pid)
+      end
+
+      def http_request(socket_path, request)
+        sock = Net::BufferedIO.new(UNIXSocket.new("#{@path}/#{socket_path}"))
+        begin
+          request.exec(sock, "1.1", request.path)
+
+          done = false
+          while !done
+            response = Net::HTTPResponse.read_new(sock)
+            done = !response.kind_of?(Net::HTTPContinue)
+          end
+
+          response.reading_body(sock, request.response_body_permitted?) do
+            # Nothing
+          end
+        ensure
+          sock.close
+        end
+
+        return response
+      end
+
+      def server_pid
+        @server_pid ||= File.read("#{@path}/server.pid").to_i
+      end
+
+      def full_admin_password
+        @full_admin_password ||= File.read("#{@path}/full_admin_password.txt")
+      end
+
+      def read_only_admin_password
+        @read_only_admin_password ||= File.read("#{@path}/read_only_admin_password.txt")
+      end
+
+    private
+      class CorruptedError < StandardError
+      end
+
+      def reload_properties
+        @properties = nil
+        @state      = nil
+        begin
+          reload_properties_internal
+        rescue CorruptedError
+          @state = :corrupted
+        end
+      end
+
+      def reload_properties_internal
+        if !File.exist?("#{@path}/creation_finalized")
+          @state = :unfinalized
+          return
+        end
+        check(File.file?("#{@path}/creation_finalized"))
+
+        properties = nil
+        begin
+          File.open("#{@path}/properties.json", "r") do |f|
+            properties = Utils::JSON.parse(f.read)
+          end
+        rescue Errno::ENOENT
+          raise CorruptedError
+        rescue RuntimeError => e
+          if e.message =~ /parse error/
+            raise CorruptedError
+          else
+            raise
+          end
+        end
+
+        check(!properties.nil?)
+        props = properties["instance_dir"]
+        check(!props.nil?)
+        major_version = props["major_version"]
+        minor_version = props["minor_version"]
+        check(major_version.is_a?(Integer))
+        check(minor_version.is_a?(Integer))
+        name = properties["name"]
+        check(name.is_a?(String))
+        check(!name.empty?)
+        server_software = properties["server_software"]
+        check(server_software.is_a?(String))
+        check(!server_software.empty?)
+        watchdog_pid = properties["watchdog_pid"]
+        check(watchdog_pid.is_a?(Integer))
+
+        version_supported =
+          major_version == PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION &&
+          minor_version <= PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
+        if !version_supported
+          @state = :structure_version_unsupported
+          return
+        end
+
+        check(File.file?("#{@path}/lock"))
+        check(File.directory?("#{@path}/agents.s"))
+        check(File.directory?("#{@path}/apps.s"))
+
+        @properties = properties
+        @name = name
+        @server_software = server_software
+        @watchdog_pid = watchdog_pid
+        @state = :good
+      end
+
+      def check(val)
+        raise CorruptedError if !val
+      end
+
+      def process_is_alive?(pid)
+        begin
+          Process.kill(0, pid)
+          return true
+        rescue Errno::ESRCH
+          return false
+        rescue SystemCallError => e
+          return true
+        end
+      end
+    end
+
+  end # module AdminTools
 end # module PhusionPassenger