passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -23,113 +23,113 @@
 #  THE SOFTWARE.
 
 begin
-	require 'rubygems'
+  require 'rubygems'
 rescue LoadError
 end
 require 'socket'
 require 'thread'
 if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
-	begin
-		require 'fastthread'
-	rescue LoadError
-		abort "You are using a very old Ruby version. You must install " +
-			"the 'fastthread' gem to fix some bugs in the Ruby threading system: " +
-			"gem install fastthread"
-	end
+  begin
+    require 'fastthread'
+  rescue LoadError
+    abort "You are using a very old Ruby version. You must install " +
+      "the 'fastthread' gem to fix some bugs in the Ruby threading system: " +
+      "gem install fastthread"
+  end
 end
 
 class Exception
-	def backtrace_string(current_location = nil)
-		if current_location.nil?
-			location = nil
-		else
-			location = "in #{current_location} "
-		end
-		current_thread = Thread.current
-		if !(thread_id = current_thread[:id])
-			current_thread.to_s =~ /:(0x[0-9a-f]+)/i
-			thread_id = $1 || '?'
-		end
-		if thread_name = current_thread[:name]
-			thread_name = "(#{thread_name})"
-		end
-		return "*** Exception #{self.class} #{location}" <<
-			"(#{self}) (process #{$$}, thread #{thread_id}#{thread_name}):\n" <<
-			"\tfrom " << backtrace.join("\n\tfrom ")
-	end
+  def backtrace_string(current_location = nil)
+    if current_location.nil?
+      location = nil
+    else
+      location = "in #{current_location} "
+    end
+    current_thread = Thread.current
+    if !(thread_id = current_thread[:id])
+      current_thread.to_s =~ /:(0x[0-9a-f]+)/i
+      thread_id = $1 || '?'
+    end
+    if thread_name = current_thread[:name]
+      thread_name = "(#{thread_name})"
+    end
+    return "*** Exception #{self.class} #{location}" <<
+      "(#{self}) (process #{$$}, thread #{thread_id}#{thread_name}):\n" <<
+      "\tfrom " << backtrace.join("\n\tfrom ")
+  end
 end
 
 class Dir
-	# Dir.pwd resolves symlinks. This version tries not to, by shelling
-	# out to the pwd tool.
-	def self.pwd_no_resolve
-		begin
-			result = `pwd`.strip
-		rescue Errno::ENOENT
-			result = `/bin/pwd`.strip
-		end
-		if result.empty?
-			return Dir.pwd
-		else
-			return result
-		end
-	end
+  # Dir.pwd resolves symlinks. This version tries not to, by shelling
+  # out to the pwd tool.
+  def self.pwd_no_resolve
+    begin
+      result = `pwd`.strip
+    rescue Errno::ENOENT
+      result = `/bin/pwd`.strip
+    end
+    if result.empty?
+      return Dir.pwd
+    else
+      return result
+    end
+  end
 end
 
 class File
-	# Dir.pwd resolves symlinks. So in turn, File.expand_path/File.absolute_path
-	# do that too. This method fixes that by using Dir.pwd_no_resolve.
-	if File.respond_to?(:absolute_path)
-		def self.absolute_path_no_resolve(path)
-			return File.absolute_path(path, Dir.pwd_no_resolve)
-		end
-	else
-		def self.absolute_path_no_resolve(path)
-			return File.expand_path(path, Dir.pwd_no_resolve)
-		end
-	end
+  # Dir.pwd resolves symlinks. So in turn, File.expand_path/File.absolute_path
+  # do that too. This method fixes that by using Dir.pwd_no_resolve.
+  if File.respond_to?(:absolute_path)
+    def self.absolute_path_no_resolve(path)
+      return File.absolute_path(path, Dir.pwd_no_resolve)
+    end
+  else
+    def self.absolute_path_no_resolve(path)
+      return File.expand_path(path, Dir.pwd_no_resolve)
+    end
+  end
 end
 
 module Signal
-	# Like Signal.list, but only returns signals that we can actually trap.
-	def self.list_trappable
-		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-		case ruby_engine
-		when "jruby"
-			result = Signal.list.dup
-			result.delete("QUIT")
-			result.delete("ILL")
-			result.delete("FPE")
-			result.delete("SEGV")
-			result.delete("USR1")
-			result.delete("IOT")
-			result.delete("EXIT")
-		else
-			result = Signal.list.dup
-			result.delete("ALRM")
-			result.delete("VTALRM")
-		end
+  # Like Signal.list, but only returns signals that we can actually trap.
+  def self.list_trappable
+    ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+    case ruby_engine
+    when "jruby"
+      result = Signal.list.dup
+      result.delete("QUIT")
+      result.delete("ILL")
+      result.delete("FPE")
+      result.delete("SEGV")
+      result.delete("USR1")
+      result.delete("IOT")
+      result.delete("EXIT")
+    else
+      result = Signal.list.dup
+      result.delete("ALRM")
+      result.delete("VTALRM")
+    end
 
-		# Don't touch SIGCHLD no matter what! On OS X waitpid() will
-		# malfunction if SIGCHLD doesn't have a correct handler.
-		result.delete("CLD")
-		result.delete("CHLD")
+    # Don't touch SIGCHLD no matter what! On OS X waitpid() will
+    # malfunction if SIGCHLD doesn't have a correct handler.
+    result.delete("CLD")
+    result.delete("CHLD")
 
-		# Other stuff that we don't want to trap no matter which
-		# Ruby engine.
-		result.delete("STOP")
-		result.delete("KILL")
+    # Other stuff that we don't want to trap no matter which
+    # Ruby engine.
+    result.delete("STOP")
+    result.delete("KILL")
 
-		return result
-	end
+    return result
+  end
 end
 
 module GC
-	if !respond_to?(:copy_on_write_friendly?)
-		# Checks whether the current Ruby interpreter's garbage
-		# collector is copy-on-write friendly.
-		def self.copy_on_write_friendly?
-			return false
-		end
-	end
+  if !respond_to?(:copy_on_write_friendly?)
+    # Checks whether the current Ruby interpreter's garbage
+    # collector is copy-on-write friendly.
+    def self.copy_on_write_friendly?
+      return false
+    end
+  end
 end

data/lib/phusion_passenger/ruby_core_io_enhancements.rb

@@ -25,84 +25,84 @@
 PhusionPassenger.require_passenger_lib 'native_support'
 
 class IO
-	if defined?(PhusionPassenger::NativeSupport)
-		# Writes all of the strings in the +components+ array into the given file
-		# descriptor using the +writev()+ system call. Unlike IO#write, this method
-		# does not require one to concatenate all those strings into a single buffer
-		# in order to send the data in a single system call. Thus, #writev is a great
-		# way to perform zero-copy I/O.
-		#
-		# Unlike the raw writev() system call, this method ensures that all given
-		# data is written before returning, by performing multiple writev() calls
-		# and whatever else is necessary.
-		#
-		#   io.writev(["hello ", "world", "\n"])
-		def writev(components)
-			return PhusionPassenger::NativeSupport.writev(fileno, components)
-		end
+  if defined?(PhusionPassenger::NativeSupport)
+    # Writes all of the strings in the +components+ array into the given file
+    # descriptor using the +writev()+ system call. Unlike IO#write, this method
+    # does not require one to concatenate all those strings into a single buffer
+    # in order to send the data in a single system call. Thus, #writev is a great
+    # way to perform zero-copy I/O.
+    #
+    # Unlike the raw writev() system call, this method ensures that all given
+    # data is written before returning, by performing multiple writev() calls
+    # and whatever else is necessary.
+    #
+    #   io.writev(["hello ", "world", "\n"])
+    def writev(components)
+      return PhusionPassenger::NativeSupport.writev(fileno, components)
+    end
 
-		# Like #writev, but accepts two arrays. The data is written in the given order.
-		#
-		#   io.writev2(["hello ", "world", "\n"], ["another ", "message\n"])
-		def writev2(components, components2)
-			return PhusionPassenger::NativeSupport.writev2(fileno,
-				components, components2)
-		end
+    # Like #writev, but accepts two arrays. The data is written in the given order.
+    #
+    #   io.writev2(["hello ", "world", "\n"], ["another ", "message\n"])
+    def writev2(components, components2)
+      return PhusionPassenger::NativeSupport.writev2(fileno,
+        components, components2)
+    end
 
-		# Like #writev, but accepts three arrays. The data is written in the given order.
-		#
-		#   io.writev3(["hello ", "world", "\n"],
-		#     ["another ", "message\n"],
-		#     ["yet ", "another ", "one", "\n"])
-		def writev3(components, components2, components3)
-			return PhusionPassenger::NativeSupport.writev3(fileno,
-				components, components2, components3)
-		end
-	else
-		def writev(components)
-			return write(components.join(''))
-		end
+    # Like #writev, but accepts three arrays. The data is written in the given order.
+    #
+    #   io.writev3(["hello ", "world", "\n"],
+    #     ["another ", "message\n"],
+    #     ["yet ", "another ", "one", "\n"])
+    def writev3(components, components2, components3)
+      return PhusionPassenger::NativeSupport.writev3(fileno,
+        components, components2, components3)
+    end
+  else
+    def writev(components)
+      return write(components.join(''))
+    end
 
-		def writev2(components, components2)
-			data = ''
-			components.each do |component|
-				data << component
-			end
-			components2.each do |component|
-				data << component
-			end
-			return write(data)
-		end
+    def writev2(components, components2)
+      data = ''
+      components.each do |component|
+        data << component
+      end
+      components2.each do |component|
+        data << component
+      end
+      return write(data)
+    end
 
-		def writev3(components, components2, components3)
-			data = ''
-			components.each do |component|
-				data << component
-			end
-			components2.each do |component|
-				data << component
-			end
-			components3.each do |component|
-				data << component
-			end
-			return write(data)
-		end
-	end
+    def writev3(components, components2, components3)
+      data = ''
+      components.each do |component|
+        data << component
+      end
+      components2.each do |component|
+        data << component
+      end
+      components3.each do |component|
+        data << component
+      end
+      return write(data)
+    end
+  end
 
-	if IO.method_defined?(:close_on_exec=)
-		def close_on_exec!
-			self.close_on_exec = true
-		end
-	else
-		require 'fcntl'
+  if IO.method_defined?(:close_on_exec=)
+    def close_on_exec!
+      self.close_on_exec = true
+    end
+  else
+    require 'fcntl'
 
-		if defined?(Fcntl::F_SETFD)
-			def close_on_exec!
-				fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-			end
-		else
-			def close_on_exec!
-			end
-		end
-	end
+    if defined?(Fcntl::F_SETFD)
+      def close_on_exec!
+        fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      end
+    else
+      def close_on_exec!
+      end
+    end
+  end
 end

data/lib/phusion_passenger/simple_benchmarking.rb

@@ -22,31 +22,31 @@
 #  THE SOFTWARE.
 
 class Object # :nodoc:
-	@@benchmark_results = {}
+  @@benchmark_results = {}
 
-	def b!(name)
-		time1 = Time.now
-		begin
-			yield
-		ensure
-			time2 = Time.now
-			@@benchmark_results[name] = 0 unless @@benchmark_results.has_key?(name)
-			@@benchmark_results[name] += time2 - time1
-		end 
-	end
+  def b!(name)
+    time1 = Time.now
+    begin
+      yield
+    ensure
+      time2 = Time.now
+      @@benchmark_results[name] = 0 unless @@benchmark_results.has_key?(name)
+      @@benchmark_results[name] += time2 - time1
+    end
+  end
 
-	def benchmark_report(main = nil)
-		total = 0
-		if main.nil?
-			@@benchmark_results.each_value do |time|
-				total += time
-			end
-		else
-			total = @@benchmark_results[main]
-		end
-		@@benchmark_results.each_pair do |name, time|
-			printf "%-12s: %.4f (%.2f%%)\n", name, time, time / total * 100
-		end
-		printf "-- Total: %.4f\n", total
-	end
+  def benchmark_report(main = nil)
+    total = 0
+    if main.nil?
+      @@benchmark_results.each_value do |time|
+        total += time
+      end
+    else
+      total = @@benchmark_results[main]
+    end
+    @@benchmark_results.each_pair do |name, time|
+      printf "%-12s: %.4f (%.2f%%)\n", name, time, time / total * 100
+    end
+    printf "-- Total: %.4f\n", total
+  end
 end

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -26,153 +26,156 @@ PhusionPassenger.require_passenger_lib 'standalone/config_utils'
 PhusionPassenger.require_passenger_lib 'utils/file_system_watcher'
 
 module PhusionPassenger
-module Standalone
-
-class AppFinder
-	STARTUP_FILES = [
-		"config.ru",
-		"passenger_wsgi.py",
-		"app.js",
-		".meteor"
-	]
-	WATCH_ENTRIES = [
-		"config", "Passengerfile.json", "passenger-standalone.json"
-	]
-
-	attr_accessor :dirs
-	attr_reader :apps
-	attr_reader :execution_root
-
-	def self.looks_like_app_directory?(dir)
-		return STARTUP_FILES.any? do |file|
-			File.exist?("#{dir}/#{file}")
-		end
-	end
-
-	def initialize(dirs, options = {})
-		@dirs = dirs
-		@options = options.dup
-		determine_mode_and_execution_root
-	end
-
-	def scan
-		apps = []
-		watchlist = []
-
-		if single_mode?
-			app_root = find_app_root
-			apps << {
-				:server_names => ["_"],
-				:root => app_root
-			}
-			watchlist << app_root
-			WATCH_ENTRIES.each do |entry|
-				if File.exist?("#{app_root}/#{entry}")
-					watchlist << "#{app_root}/#{entry}"
-				end
-			end
-
-			apps.map! do |app|
-				@options.merge(app)
-			end
-		end
-
-		@apps = apps
-		@watchlist = watchlist
-		return apps
-	end
-
-	def monitor(termination_pipe)
-		raise "You must call #scan first" if !@apps
-
-		watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
-		if wait_on_io(termination_pipe, 3)
-			return
-		end
-
-		while true
-			changed = watcher.wait_for_change
-			watcher.close
-			if changed
-				old_apps = @apps
-				# The change could be caused by a write to some passenger.conf file.
-				# Wait for a short period so that the write has a chance to finish.
-				if wait_on_io(termination_pipe, 0.25)
-					return
-				end
-
-				new_apps = scan
-				watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
-				if old_apps != new_apps
-					yield(new_apps)
-				end
-
-				# Don't process change events again for a short while,
-				# but do detect changes while waiting.
-				if wait_on_io(termination_pipe, 3)
-					return
-				end
-			else
-				return
-			end
-		end
-	ensure
-		watcher.close if watcher
-	end
-
-	def single_mode?
-		return @mode == :single
-	end
-
-	def multi_mode?
-		return !single_mode?
-	end
-
-	##################
-
-private
-	class ConfigLoadError < StandardError
-	end
-
-	def find_app_root
-		if @dirs.empty?
-			return File.absolute_path_no_resolve(".")
-		else
-			return File.absolute_path_no_resolve(@dirs[0])
-		end
-	end
-
-	def looks_like_app_directory?(dir)
-		return AppFinder.looks_like_app_directory?(dir)
-	end
-
-	def filename_to_server_names(filename)
-		basename = File.basename(filename)
-		names = [basename]
-		if basename !~ /^www\.$/i
-			names << "www.#{basename}"
-		end
-		return names
-	end
-
-	# Wait until the given IO becomes readable, or until the timeout has
-	# been reached. Returns true if the IO became readable, false if the
-	# timeout has been reached.
-	def wait_on_io(io, timeout)
-		return !!select([io], nil, nil, timeout)
-	end
-
-	def determine_mode_and_execution_root
-		@mode = :single
-		if @dirs.empty?
-			@execution_root = File.absolute_path_no_resolve(".")
-		else
-			@execution_root = File.absolute_path_no_resolve(@dirs[0])
-		end
-	end
-
-	##################
-end
-
-end # module Standalone
+  module Standalone
+
+    class AppFinder
+      STARTUP_FILES = [
+        "config.ru",
+        "passenger_wsgi.py",
+        "app.js",
+        ".meteor"
+      ]
+      WATCH_ENTRIES = [
+        "config", "Passengerfile.json", "passenger-standalone.json"
+      ]
+
+      attr_accessor :dirs
+      attr_reader :apps
+      attr_reader :execution_root
+
+      def self.looks_like_app_directory?(dir, options = {})
+        options = options.dup
+        ConfigUtils.load_local_config_file!(dir, options)
+        return options[:app_type] ||
+          STARTUP_FILES.any? do |file|
+            File.exist?("#{dir}/#{file}")
+          end
+      end
+
+      def initialize(dirs, options = {})
+        @dirs = dirs
+        @options = options.dup
+        determine_mode_and_execution_root(options)
+      end
+
+      def scan
+        apps = []
+        watchlist = []
+
+        if single_mode?
+          app_root = find_app_root
+          apps << {
+            :server_names => ["_"],
+            :root => app_root
+          }
+          watchlist << app_root
+          WATCH_ENTRIES.each do |entry|
+            if File.exist?("#{app_root}/#{entry}")
+              watchlist << "#{app_root}/#{entry}"
+            end
+          end
+
+          apps.map! do |app|
+            @options.merge(app)
+          end
+        end
+
+        @apps = apps
+        @watchlist = watchlist
+        return apps
+      end
+
+      def monitor(termination_pipe)
+        raise "You must call #scan first" if !@apps
+
+        watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
+        if wait_on_io(termination_pipe, 3)
+          return
+        end
+
+        while true
+          changed = watcher.wait_for_change
+          watcher.close
+          if changed
+            old_apps = @apps
+            # The change could be caused by a write to some Passengerfile.json file.
+            # Wait for a short period so that the write has a chance to finish.
+            if wait_on_io(termination_pipe, 0.25)
+              return
+            end
+
+            new_apps = scan
+            watcher = PhusionPassenger::Utils::FileSystemWatcher.new(@watchlist, termination_pipe)
+            if old_apps != new_apps
+              yield(new_apps)
+            end
+
+            # Don't process change events again for a short while,
+            # but do detect changes while waiting.
+            if wait_on_io(termination_pipe, 3)
+              return
+            end
+          else
+            return
+          end
+        end
+      ensure
+        watcher.close if watcher
+      end
+
+      def single_mode?
+        return @mode == :single
+      end
+
+      def multi_mode?
+        return !single_mode?
+      end
+
+      ##################
+
+    private
+      class ConfigLoadError < StandardError
+      end
+
+      def find_app_root
+        if @dirs.empty?
+          return File.absolute_path_no_resolve(".")
+        else
+          return File.absolute_path_no_resolve(@dirs[0])
+        end
+      end
+
+      def looks_like_app_directory?(dir, options = {})
+        return AppFinder.looks_like_app_directory?(dir, options)
+      end
+
+      def filename_to_server_names(filename)
+        basename = File.basename(filename)
+        names = [basename]
+        if basename !~ /^www\.$/i
+          names << "www.#{basename}"
+        end
+        return names
+      end
+
+      # Wait until the given IO becomes readable, or until the timeout has
+      # been reached. Returns true if the IO became readable, false if the
+      # timeout has been reached.
+      def wait_on_io(io, timeout)
+        return !!select([io], nil, nil, timeout)
+      end
+
+      def determine_mode_and_execution_root(options)
+        @mode = :single
+        if @dirs.empty?
+          @execution_root = File.absolute_path_no_resolve(".")
+        else
+          @execution_root = File.absolute_path_no_resolve(@dirs[0])
+        end
+      end
+
+      ##################
+    end
+
+  end # module Standalone
 end # module PhusionPassenger