passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/platform_info/zlib.rb

@@ -25,14 +25,14 @@ PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 
-module PlatformInfo
-	def self.zlib_flags
-		return nil
-	end
-	
-	def self.zlib_libs
-		return '-lz'
-	end
-end
+  module PlatformInfo
+    def self.zlib_flags
+      return nil
+    end
+
+    def self.zlib_libs
+      return '-lz'
+    end
+  end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/plugin.rb

@@ -25,71 +25,71 @@ require 'etc'
 
 module PhusionPassenger
 
-class Plugin
-	@@hooks = {}
-	@@classes = {}
-	
-	def self.load(name, load_once = true)
-		PLUGIN_DIRS.each do |plugin_dir|
-			if plugin_dir =~ /\A~/
-				# File.expand_path uses ENV['HOME'] which we don't want.
-				home = Etc.getpwuid(Process.uid).dir
-				plugin_dir = plugin_dir.sub(/\A~/, home)
-			end
-			plugin_dir = File.expand_path(plugin_dir)
-			Dir["#{plugin_dir}/*/#{name}.rb"].each do |filename|
-				if load_once
-					require(filename)
-				else
-					load(filename)
-				end
-			end
-		end
-	end
-	
-	def self.register_hook(name, &block)
-		hooks_list = (@@hooks[name] ||= [])
-		hooks_list << block
-	end
-	
-	def self.call_hook(name, *args, &block)
-		last_result = nil
-		if (hooks_list = @@hooks[name])
-			hooks_list.each do |callback|
-				last_result = callback.call(*args, &block)
-			end
-		end
-		return last_result
-	end
-	
-	def self.register(name, klass)
-		classes = (@@classes[name] ||= [])
-		classes << klass
-	end
-	
-	def initialize(name, *args, &block)
-		Plugin.load(name)
-		classes = @@classes[name]
-		if classes
-			@instances = classes.map do |klass|
-				klass.new(*args, &block)
-			end
-		else
-			return nil
-		end
-	end
-	
-	def call_hook(name, *args, &block)
-		last_result = nil
-		if @instances
-			@instances.each do |instance|
-				if instance.respond_to?(name.to_sym)
-					last_result = instance.__send__(name.to_sym, *args, &block)
-				end
-			end
-		end
-		return last_result
-	end
-end
+  class Plugin
+    @@hooks = {}
+    @@classes = {}
+
+    def self.load(name, load_once = true)
+      PLUGIN_DIRS.each do |plugin_dir|
+        if plugin_dir =~ /\A~/
+          # File.expand_path uses ENV['HOME'] which we don't want.
+          home = Etc.getpwuid(Process.uid).dir
+          plugin_dir = plugin_dir.sub(/\A~/, home)
+        end
+        plugin_dir = File.expand_path(plugin_dir)
+        Dir["#{plugin_dir}/*/#{name}.rb"].each do |filename|
+          if load_once
+            require(filename)
+          else
+            load(filename)
+          end
+        end
+      end
+    end
+
+    def self.register_hook(name, &block)
+      hooks_list = (@@hooks[name] ||= [])
+      hooks_list << block
+    end
+
+    def self.call_hook(name, *args, &block)
+      last_result = nil
+      if (hooks_list = @@hooks[name])
+        hooks_list.each do |callback|
+          last_result = callback.call(*args, &block)
+        end
+      end
+      return last_result
+    end
+
+    def self.register(name, klass)
+      classes = (@@classes[name] ||= [])
+      classes << klass
+    end
+
+    def initialize(name, *args, &block)
+      Plugin.load(name)
+      classes = @@classes[name]
+      if classes
+        @instances = classes.map do |klass|
+          klass.new(*args, &block)
+        end
+      else
+        return nil
+      end
+    end
+
+    def call_hook(name, *args, &block)
+      last_result = nil
+      if @instances
+        @instances.each do |instance|
+          if instance.respond_to?(name.to_sym)
+            last_result = instance.__send__(name.to_sym, *args, &block)
+          end
+        end
+      end
+      return last_result
+    end
+  end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -29,141 +29,141 @@ PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
 
-# Provides shared functions for preloader apps.
-module PreloaderSharedHelpers
-	extend self
+  # Provides shared functions for preloader apps.
+  module PreloaderSharedHelpers
+    extend self
 
-	def init(options)
-		if !Kernel.respond_to?(:fork)
-			message = "Smart spawning is not available on this Ruby " +
-				"implementation because it does not support `Kernel.fork`. "
-			if ENV['SERVER_SOFTWARE'].to_s =~ /nginx/i
-				message << "Please set `passenger_spawn_method` to `direct`."
-			else
-				message << "Please set `PassengerSpawnMethod` to `direct`."
-			end
-			raise(message)
-		end
-		return options
-	end
+    def init(options)
+      if !Kernel.respond_to?(:fork)
+        message = "Smart spawning is not available on this Ruby " +
+          "implementation because it does not support `Kernel.fork`. "
+        if ENV['SERVER_SOFTWARE'].to_s =~ /nginx/i
+          message << "Please set `passenger_spawn_method` to `direct`."
+        else
+          message << "Please set `PassengerSpawnMethod` to `direct`."
+        end
+        raise(message)
+      end
+      return options
+    end
 
-	def accept_and_process_next_client(server_socket)
-		original_pid = Process.pid
-		client = server_socket.accept
-		client.binmode
-		begin
-			command = client.readline
-		rescue EOFError
-			return nil
-		end
-		if command !~ /\n\Z/
-			STDERR.puts "Command must end with a newline"
-		elsif command == "spawn\n"
-			while client.readline != "\n"
-				# Do nothing.
-			end
+    def accept_and_process_next_client(server_socket)
+      original_pid = Process.pid
+      client = server_socket.accept
+      client.binmode
+      begin
+        command = client.readline
+      rescue EOFError
+        return nil
+      end
+      if command !~ /\n\Z/
+        STDERR.puts "Command must end with a newline"
+      elsif command == "spawn\n"
+        while client.readline != "\n"
+          # Do nothing.
+        end
 
-			# Improve copy-on-write friendliness.
-			GC.start
+        # Improve copy-on-write friendliness.
+        GC.start
 
-			pid = fork
-			if pid.nil?
-				$0 = "#{$0} (forking...)"
-				client.puts "OK"
-				client.puts Process.pid
-				client.flush
-				client.sync = true
-				return [:forked, client]
-			elsif defined?(NativeSupport)
-				NativeSupport.detach_process(pid)
-			else
-				Process.detach(pid)
-			end
-		else
-			STDERR.puts "Unknown command '#{command.inspect}'"
-		end
-		return nil
-	ensure
-		if client && Process.pid == original_pid
-			begin
-				client.close
-			rescue Errno::EINVAL
-				# Work around OS X bug.
-				# https://code.google.com/p/phusion-passenger/issues/detail?id=854
-			end
-		end
-	end
+        pid = fork
+        if pid.nil?
+          $0 = "#{$0} (forking...)"
+          client.puts "OK"
+          client.puts Process.pid
+          client.flush
+          client.sync = true
+          return [:forked, client]
+        elsif defined?(NativeSupport)
+          NativeSupport.detach_process(pid)
+        else
+          Process.detach(pid)
+        end
+      else
+        STDERR.puts "Unknown command '#{command.inspect}'"
+      end
+      return nil
+    ensure
+      if client && Process.pid == original_pid
+        begin
+          client.close
+        rescue Errno::EINVAL
+          # Work around OS X bug.
+          # https://code.google.com/p/phusion-passenger/issues/detail?id=854
+        end
+      end
+    end
 
-	def run_main_loop(options)
-		$0 = "Passenger AppPreloader: #{options['app_root']}"
-		client = nil
-		original_pid = Process.pid
+    def run_main_loop(options)
+      $0 = "Passenger AppPreloader: #{options['app_root']}"
+      client = nil
+      original_pid = Process.pid
 
-		if defined?(NativeSupport)
-			unix_path_max = NativeSupport::UNIX_PATH_MAX
-		else
-			unix_path_max = options.fetch('UNIX_PATH_MAX', 100).to_i
-		end
-		if options['socket_dir']
-			socket_dir = options['socket_dir']
-			socket_prefix = "preloader"
-		else
-			socket_dir = Dir.tmpdir
-			socket_prefix = "PsgPreloader"
-		end
+      if defined?(NativeSupport)
+        unix_path_max = NativeSupport::UNIX_PATH_MAX
+      else
+        unix_path_max = options.fetch('UNIX_PATH_MAX', 100).to_i
+      end
+      if options['socket_dir']
+        socket_dir = options['socket_dir']
+        socket_prefix = "preloader"
+      else
+        socket_dir = Dir.tmpdir
+        socket_prefix = "PsgPreloader"
+      end
 
-		socket_filename = nil
-		server = nil
-		Utils.retry_at_most(128, Errno::EADDRINUSE) do
-			socket_filename = "#{socket_dir}/#{socket_prefix}.#{rand(0xFFFFFFFF).to_s(36)}"
-			socket_filename = socket_filename.slice(0, unix_path_max - 10)
-			server = UNIXServer.new(socket_filename)
-		end
-		server.close_on_exec!
-		File.chmod(0600, socket_filename)
+      socket_filename = nil
+      server = nil
+      Utils.retry_at_most(128, Errno::EADDRINUSE) do
+        socket_filename = "#{socket_dir}/#{socket_prefix}.#{rand(0xFFFFFFFF).to_s(36)}"
+        socket_filename = socket_filename.slice(0, unix_path_max - 10)
+        server = UNIXServer.new(socket_filename)
+      end
+      server.close_on_exec!
+      File.chmod(0600, socket_filename)
 
-		# Update the dump information just before telling the preloader that we're
-		# ready because the HelperAgent will read and memorize this information.
-		LoaderSharedHelpers.dump_all_information
+      # Update the dump information just before telling the preloader that we're
+      # ready because the HelperAgent will read and memorize this information.
+      LoaderSharedHelpers.dump_all_information(options)
 
-		puts "!> Ready"
-		puts "!> socket: unix:#{socket_filename}"
-		puts "!> "
+      puts "!> Ready"
+      puts "!> socket: unix:#{socket_filename}"
+      puts "!> "
 
-		while true
-			# We call ::select just in case someone overwrites the global select()
-			# function by including ActionView::Helpers in the wrong place.
-			# https://code.google.com/p/phusion-passenger/issues/detail?id=915
-			ios = Kernel.select([server, STDIN])[0]
-			if ios.include?(server)
-				result, client = accept_and_process_next_client(server)
-				if result == :forked
-					STDIN.reopen(client)
-					STDOUT.reopen(client)
-					STDOUT.sync = true
-					client.close
-					return :forked
-				end
-			end
-			if ios.include?(STDIN)
-				if STDIN.tty?
-					begin
-						# Prevent bash from exiting when we press Ctrl-D.
-						STDIN.read_nonblock(1)
-					rescue Errno::EAGAIN
-						# Do nothing.
-					end
-				end
-				break
-			end
-		end
-		return nil
-	ensure
-		server.close if server
-		if original_pid == Process.pid
-			File.unlink(socket_filename) rescue nil
-		end
-	end
-end
+      while true
+        # We call ::select just in case someone overwrites the global select()
+        # function by including ActionView::Helpers in the wrong place.
+        # https://code.google.com/p/phusion-passenger/issues/detail?id=915
+        ios = Kernel.select([server, STDIN])[0]
+        if ios.include?(server)
+          result, client = accept_and_process_next_client(server)
+          if result == :forked
+            STDIN.reopen(client)
+            STDOUT.reopen(client)
+            STDOUT.sync = true
+            client.close
+            return :forked
+          end
+        end
+        if ios.include?(STDIN)
+          if STDIN.tty?
+            begin
+              # Prevent bash from exiting when we press Ctrl-D.
+              STDIN.read_nonblock(1)
+            rescue Errno::EAGAIN
+              # Do nothing.
+            end
+          end
+          break
+        end
+      end
+      return nil
+    ensure
+      server.close if server
+      if original_pid == Process.pid
+        File.unlink(socket_filename) rescue nil
+      end
+    end
+  end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/public_api.rb

@@ -22,195 +22,195 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-class << self
-	@@event_starting_worker_process = []
-	@@event_stopping_worker_process = []
-	@@event_starting_request_handler_thread = []
-	@@event_credentials = []
-	@@event_after_installing_signal_handlers = []
-	@@event_oob_work = []
-	@@advertised_concurrency_level = nil
-
-	def on_event(name, &block)
-		callback_list_for_event(name) << block
-	end
-	
-	def call_event(name, *args)
-		callback_list_for_event(name).each do |callback|
-			callback.call(*args)
-		end
-	end
-	
-	def install_framework_extensions!(*args)
-		require 'active_support/version' if defined?(::ActiveSupport) && !defined?(::ActiveSupport::VERSION)
-		if defined?(::ActiveSupport) && ::ActiveSupport::VERSION::MAJOR >= 3
-			PhusionPassenger.require_passenger_lib 'active_support3_extensions/init'
-			ActiveSupport3Extensions.init!(PhusionPassenger::App.options, *args)
-		end
-	end
-
-	def advertised_concurrency_level
-		@@advertised_concurrency_level
-	end
-
-	def advertised_concurrency_level=(value)
-		@@advertised_concurrency_level = value
-	end
-	
-	def measure_and_log_event(env, name)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			transaction.measure(name) do
-				yield
-			end
-		else
-			yield
-		end
-	end
-
-	def benchmark(env = nil, title = "Benchmarking", &block)
-		measure_and_log_event(env, "BENCHMARK: #{title}", &block)
-	end
-
-	# Log an exception that occurred during a request.
-	def log_request_exception(env, exception, options = nil)
-		return if !env[PASSENGER_TXN_ID]
-		core = lookup_union_station_core(env)
-		if core
-			transaction = core.new_transaction(
-				env[PASSENGER_APP_GROUP_NAME],
-				:exceptions,
-				env[PASSENGER_UNION_STATION_KEY])
-			begin
-				request_txn_id = 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", "")
-
-				transaction.message("Request transaction ID: #{request_txn_id}")
-				transaction.message("Message: #{message}")
-				transaction.message("Class: #{exception.class.name}")
-				transaction.message("Backtrace: #{backtrace_string}")
-
-				if options && options[:controller_name]
-					if options[:action_name]
-						controller_action = "#{options[:controller_name]}##{options[:action_name]}"
-					else
-						controller_action = controller_name
-					end
-					transaction.message("Controller action: #{controller_action}")
-				end
-			ensure
-				transaction.close
-			end
-		end
-	end
-
-	# Log a controller action invocation.
-	def log_controller_action(env, options)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			if options[:controller_name]
-				if !options[:action_name]
-					raise ArgumentError, "The :action_name option must be set"
-				end
-				transaction.message("Controller action: #{options[:controller_name]}##{options[:action_name]}")
-			end
-			if options[:method]
-				transaction.message("Request method: #{options[:method]}")
-			end
-			transaction.measure("framework request processing") do
-				yield
-			end
-		else
-			yield
-		end
-	end
-
-	# Log the total view rendering time of a request.
-	def log_total_view_rendering_time(env, runtime)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			transaction.message("View rendering time: #{(runtime).to_i}")
-		end
-	end
-
-	# Log a single view rendering.
-	def log_view_rendering(env = nil, &block)
-		measure_and_log_event(env, "view rendering", &block)
-	end
-	
-	# Log a database query.
-	def log_database_query(env, name, begin_time, end_time, sql)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			digest = Digest::MD5.hexdigest("#{name}\0#{sql}\0#{rand}")
-			transaction.measured_time_points("DB BENCHMARK: #{digest}",
-				begin_time,
-				end_time,
-				"#{name}\n#{sql}")
-		end
-	end
-
-	def log_cache_hit(env, name)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			transaction.message("Cache hit: #{name}")
-			return true
-		else
-			return false
-		end
-	end
-	
-	def log_cache_miss(env, name, generation_time = nil)
-		transaction = lookup_union_station_web_transaction(env)
-		if transaction
-			if generation_time
-				transaction.message("Cache miss (#{generation_time.to_i}): #{name}")
-			else
-				transaction.message("Cache miss: #{name}")
-			end
-			return true
-		else
-			return false
-		end
-	end
-
-private
-	def callback_list_for_event(name)
-		return case name
-		when :starting_worker_process
-			@@event_starting_worker_process
-		when :stopping_worker_process
-			@@event_stopping_worker_process
-		when :starting_request_handler_thread
-			@@event_starting_request_handler_thread
-		when :credentials
-			@@event_credentials
-		when :after_installing_signal_handlers
-			@@event_after_installing_signal_handlers
-		when :oob_work
-			@@event_oob_work
-		else
-			raise ArgumentError, "Unknown event name '#{name}'"
-		end
-	end
-
-	def lookup_union_station_core(env = nil)
-		if env
-			result = env[UNION_STATION_CORE]
-		end
-		return result || Thread.current[UNION_STATION_CORE]
-	end
-
-	def lookup_union_station_web_transaction(env = nil)
-		if env
-			result = env[UNION_STATION_REQUEST_TRANSACTION]
-		end
-		return result || Thread.current[UNION_STATION_REQUEST_TRANSACTION]
-	end
-end
+  class << self
+    @@event_starting_worker_process = []
+    @@event_stopping_worker_process = []
+    @@event_starting_request_handler_thread = []
+    @@event_credentials = []
+    @@event_after_installing_signal_handlers = []
+    @@event_oob_work = []
+    @@advertised_concurrency_level = nil
+
+    def on_event(name, &block)
+      callback_list_for_event(name) << block
+    end
+
+    def call_event(name, *args)
+      callback_list_for_event(name).each do |callback|
+        callback.call(*args)
+      end
+    end
+
+    def install_framework_extensions!(*args)
+      require 'active_support/version' if defined?(::ActiveSupport) && !defined?(::ActiveSupport::VERSION)
+      if defined?(::ActiveSupport) && ::ActiveSupport::VERSION::MAJOR >= 3
+        PhusionPassenger.require_passenger_lib 'active_support3_extensions/init'
+        ActiveSupport3Extensions.init!(PhusionPassenger::App.options, *args)
+      end
+    end
+
+    def advertised_concurrency_level
+      @@advertised_concurrency_level
+    end
+
+    def advertised_concurrency_level=(value)
+      @@advertised_concurrency_level = value
+    end
+
+    def measure_and_log_event(env, name)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        transaction.measure(name) do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
+    def benchmark(env = nil, title = "Benchmarking", &block)
+      measure_and_log_event(env, "BENCHMARK: #{title}", &block)
+    end
+
+    # Log an exception that occurred during a request.
+    def log_request_exception(env, exception, options = nil)
+      return if !env[PASSENGER_TXN_ID]
+      core = lookup_union_station_core(env)
+      if core
+        transaction = core.new_transaction(
+          env[PASSENGER_APP_GROUP_NAME],
+          :exceptions,
+          env[PASSENGER_UNION_STATION_KEY])
+        begin
+          request_txn_id = 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", "")
+
+          transaction.message("Request transaction ID: #{request_txn_id}")
+          transaction.message("Message: #{message}")
+          transaction.message("Class: #{exception.class.name}")
+          transaction.message("Backtrace: #{backtrace_string}")
+
+          if options && options[:controller_name]
+            if options[:action_name]
+              controller_action = "#{options[:controller_name]}##{options[:action_name]}"
+            else
+              controller_action = controller_name
+            end
+            transaction.message("Controller action: #{controller_action}")
+          end
+        ensure
+          transaction.close
+        end
+      end
+    end
+
+    # Log a controller action invocation.
+    def log_controller_action(env, options)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        if options[:controller_name]
+          if !options[:action_name]
+            raise ArgumentError, "The :action_name option must be set"
+          end
+          transaction.message("Controller action: #{options[:controller_name]}##{options[:action_name]}")
+        end
+        if options[:method]
+          transaction.message("Request method: #{options[:method]}")
+        end
+        transaction.measure("framework request processing") do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
+    # Log the total view rendering time of a request.
+    def log_total_view_rendering_time(env, runtime)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        transaction.message("View rendering time: #{(runtime).to_i}")
+      end
+    end
+
+    # Log a single view rendering.
+    def log_view_rendering(env = nil, &block)
+      measure_and_log_event(env, "view rendering", &block)
+    end
+
+    # Log a database query.
+    def log_database_query(env, name, begin_time, end_time, sql)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        digest = Digest::MD5.hexdigest("#{name}\0#{sql}\0#{rand}")
+        transaction.measured_time_points("DB BENCHMARK: #{digest}",
+          begin_time,
+          end_time,
+          "#{name}\n#{sql}")
+      end
+    end
+
+    def log_cache_hit(env, name)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        transaction.message("Cache hit: #{name}")
+        return true
+      else
+        return false
+      end
+    end
+
+    def log_cache_miss(env, name, generation_time = nil)
+      transaction = lookup_union_station_web_transaction(env)
+      if transaction
+        if generation_time
+          transaction.message("Cache miss (#{generation_time.to_i}): #{name}")
+        else
+          transaction.message("Cache miss: #{name}")
+        end
+        return true
+      else
+        return false
+      end
+    end
+
+  private
+    def callback_list_for_event(name)
+      return case name
+      when :starting_worker_process
+        @@event_starting_worker_process
+      when :stopping_worker_process
+        @@event_stopping_worker_process
+      when :starting_request_handler_thread
+        @@event_starting_request_handler_thread
+      when :credentials
+        @@event_credentials
+      when :after_installing_signal_handlers
+        @@event_after_installing_signal_handlers
+      when :oob_work
+        @@event_oob_work
+      else
+        raise ArgumentError, "Unknown event name '#{name}'"
+      end
+    end
+
+    def lookup_union_station_core(env = nil)
+      if env
+        result = env[UNION_STATION_CORE]
+      end
+      return result || Thread.current[UNION_STATION_CORE]
+    end
+
+    def lookup_union_station_web_transaction(env = nil)
+      if env
+        result = env[UNION_STATION_REQUEST_TRANSACTION]
+      end
+      return result || Thread.current[UNION_STATION_REQUEST_TRANSACTION]
+    end
+  end
 end # module PhusionPassenger