passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/console_text_template.rb

@@ -27,32 +27,32 @@ PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
 
-class ConsoleTextTemplate
-	def initialize(input, options = {})
-		@buffer = ''
-		if input[:file]
-			filename = "#{PhusionPassenger.resources_dir}/templates/#{input[:file]}.txt.erb"
-			data = File.read(filename)
-		else
-			data = input[:text]
-		end
-		@colors = options[:colors] || AnsiColors.new
-		@template = ERB.new(@colors.ansi_colorize(data),
-			nil, '-', '@buffer')
-		@template.filename = filename if filename
-		options.each_pair do |name, value|
-			self[name] = value
-		end
-	end
+  class ConsoleTextTemplate
+    def initialize(input, options = {})
+      @buffer = ''
+      if input[:file]
+        filename = "#{PhusionPassenger.resources_dir}/templates/#{input[:file]}.txt.erb"
+        data = File.read(filename)
+      else
+        data = input[:text]
+      end
+      @colors = options[:colors] || AnsiColors.new
+      @template = ERB.new(@colors.ansi_colorize(data),
+        nil, '-', '@buffer')
+      @template.filename = filename if filename
+      options.each_pair do |name, value|
+        self[name] = value
+      end
+    end
 
-	def []=(name, value)
-		instance_variable_set("@#{name}".to_sym, value)
-		return self
-	end
+    def []=(name, value)
+      instance_variable_set("@#{name}".to_sym, value)
+      return self
+    end
 
-	def result
-		return @template.result(binding)
-	end
-end
+    def result
+      return @template.result(binding)
+    end
+  end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/constants.rb

@@ -22,101 +22,101 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-	UNION_STATION_CORE          = "UNION_STATION_CORE".freeze
-	UNION_STATION_REQUEST_TRANSACTION = "UNION_STATION_REQUEST_TRANSACTION".freeze
-	PASSENGER_TXN_ID            = "PASSENGER_TXN_ID".freeze
-	PASSENGER_APP_GROUP_NAME    = "PASSENGER_APP_GROUP_NAME".freeze
-	PASSENGER_UNION_STATION_KEY = "UNION_STATION_KEY".freeze
-	RACK_HIJACK_IO              = "rack.hijack_io".freeze
+  UNION_STATION_CORE          = "UNION_STATION_CORE".freeze
+  UNION_STATION_REQUEST_TRANSACTION = "UNION_STATION_REQUEST_TRANSACTION".freeze
+  PASSENGER_TXN_ID            = "PASSENGER_TXN_ID".freeze
+  PASSENGER_APP_GROUP_NAME    = "PASSENGER_APP_GROUP_NAME".freeze
+  PASSENGER_UNION_STATION_KEY = "UNION_STATION_KEY".freeze
+  RACK_HIJACK_IO              = "rack.hijack_io".freeze
 
-	LVL_CRIT   = 0
-	LVL_ERROR  = 1
-	LVL_WARN   = 2
-	LVL_NOTICE = 3
-	LVL_INFO   = 4
-	LVL_DEBUG  = 5
-	LVL_DEBUG2 = 6
-	LVL_DEBUG3 = 7
+  LVL_CRIT   = 0
+  LVL_ERROR  = 1
+  LVL_WARN   = 2
+  LVL_NOTICE = 3
+  LVL_INFO   = 4
+  LVL_DEBUG  = 5
+  LVL_DEBUG2 = 6
+  LVL_DEBUG3 = 7
 
-	# Constants shared between the C++ and Ruby codebase. The C++ Constants.h
-	# is automatically generated by the build system from the following
-	# definitions.
-	module SharedConstants
-		# Default config values
-		DEFAULT_LOG_LEVEL = 3
-		DEFAULT_RUBY = "ruby"
-		DEFAULT_PYTHON = "python"
-		DEFAULT_NODEJS = "node"
-		DEFAULT_MAX_POOL_SIZE = 6
-		DEFAULT_POOL_IDLE_TIME = 300
-		DEFAULT_START_TIMEOUT = 90_000
-		DEFAULT_WEB_APP_USER = "nobody"
-		DEFAULT_APP_ENV = "production"
-		DEFAULT_SPAWN_METHOD = "smart"
-		DEFAULT_CONCURRENCY_MODEL = "process"
-		DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
-		DEFAULT_APP_THREAD_COUNT = 1
-		DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK = 1024 * 1024 * 128
-		DEFAULT_STAT_THROTTLE_RATE = 10
-		DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
-		DEFAULT_ANALYTICS_LOG_GROUP = ""
-		DEFAULT_ANALYTICS_LOG_PERMISSIONS = "u=rwx,g=rx,o=rx"
-		DEFAULT_UNION_STATION_GATEWAY_ADDRESS = "gateway.unionstationapp.com"
-		DEFAULT_UNION_STATION_GATEWAY_PORT = 443
-		DEFAULT_HTTP_SERVER_LISTEN_ADDRESS = "tcp://127.0.0.1:3000"
-		DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS = "tcp://127.0.0.1:9344"
-		DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
+  # Constants shared between the C++ and Ruby codebase. The C++ Constants.h
+  # is automatically generated by the build system from the following
+  # definitions.
+  module SharedConstants
+    # Default config values
+    DEFAULT_LOG_LEVEL = 3
+    DEFAULT_RUBY = "ruby"
+    DEFAULT_PYTHON = "python"
+    DEFAULT_NODEJS = "node"
+    DEFAULT_MAX_POOL_SIZE = 6
+    DEFAULT_POOL_IDLE_TIME = 300
+    DEFAULT_START_TIMEOUT = 90_000
+    DEFAULT_WEB_APP_USER = "nobody"
+    DEFAULT_APP_ENV = "production"
+    DEFAULT_SPAWN_METHOD = "smart"
+    DEFAULT_CONCURRENCY_MODEL = "process"
+    DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
+    DEFAULT_APP_THREAD_COUNT = 1
+    DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK = 1024 * 1024 * 128
+    DEFAULT_STAT_THROTTLE_RATE = 10
+    DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
+    DEFAULT_ANALYTICS_LOG_GROUP = ""
+    DEFAULT_ANALYTICS_LOG_PERMISSIONS = "u=rwx,g=rx,o=rx"
+    DEFAULT_UNION_STATION_GATEWAY_ADDRESS = "gateway.unionstationapp.com"
+    DEFAULT_UNION_STATION_GATEWAY_PORT = 443
+    DEFAULT_HTTP_SERVER_LISTEN_ADDRESS = "tcp://127.0.0.1:3000"
+    DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS = "tcp://127.0.0.1:9344"
+    DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
 
-		# Size limits
-		MESSAGE_SERVER_MAX_USERNAME_SIZE = 100
-		MESSAGE_SERVER_MAX_PASSWORD_SIZE = 100
-		POOL_HELPER_THREAD_STACK_SIZE = 1024 * 256
-		DEFAULT_MBUF_CHUNK_SIZE = 16 * 32
-		SERVER_KIT_MAX_SERVER_ENDPOINTS = 4
+    # Size limits
+    MESSAGE_SERVER_MAX_USERNAME_SIZE = 100
+    MESSAGE_SERVER_MAX_PASSWORD_SIZE = 100
+    POOL_HELPER_THREAD_STACK_SIZE = 1024 * 256
+    DEFAULT_MBUF_CHUNK_SIZE = 16 * 32
+    SERVER_KIT_MAX_SERVER_ENDPOINTS = 4
 
-		# Time limits
-		PROCESS_SHUTDOWN_TIMEOUT = 60 # In seconds
-		PROCESS_SHUTDOWN_TIMEOUT_DISPLAY = "1 minute"
+    # Time limits
+    PROCESS_SHUTDOWN_TIMEOUT = 60 # In seconds
+    PROCESS_SHUTDOWN_TIMEOUT_DISPLAY = "1 minute"
 
-		# Versions
-		PASSENGER_VERSION = PhusionPassenger::VERSION_STRING
-		SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 2
-		SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
+    # Versions
+    PASSENGER_VERSION = PhusionPassenger::VERSION_STRING
+    SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 2
+    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
 
-		# Misc
-		FEEDBACK_FD = 3
-		PROGRAM_NAME = "Phusion Passenger"
-		SERVER_TOKEN_NAME = "Phusion_Passenger"
-		FLYING_PASSENGER_NAME = "Flying Passenger"
-		INDEX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide.html"
-		APACHE2_DOC_URL     = "https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html"
-		NGINX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
-		STANDALONE_DOC_URL  = "https://www.phusionpassenger.com/documentation/Users%20guide%20Standalone.html"
-		SUPPORT_URL         = "https://www.phusionpassenger.com/documentation_and_support"
-		ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
-		GLOBAL_NAMESPACE_DIRNAME            = PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME_
-		# Subdirectory under $HOME to use for storing stuff.
-		USER_NAMESPACE_DIRNAME              = PhusionPassenger::USER_NAMESPACE_DIRNAME_
-		AGENT_EXE                 = "PassengerAgent"
-		DEB_MAIN_PACKAGE          = "passenger"
-		DEB_DEV_PACKAGE           = "passenger-dev"
-		DEB_APACHE_MODULE_PACKAGE = "libapache2-mod-passenger"
-		DEB_NGINX_PACKAGE         = "nginx-extras"
-		RPM_MAIN_PACKAGE          = "passenger"
-		RPM_DEV_PACKAGE           = "passenger-devel"
-		RPM_APACHE_MODULE_PACKAGE = "mod_passenger"
-		RPM_NGINX_PACKAGE         = "nginx"
-		STANDALONE_NGINX_CONFIGURE_OPTIONS =
-			"--with-cc-opt='-Wno-error' " <<
-			"--without-http_fastcgi_module " <<
-			"--without-http_scgi_module " <<
-			"--without-http_uwsgi_module " <<
-			"--with-http_gzip_static_module " <<
-			"--with-http_stub_status_module " <<
-			"--with-http_ssl_module"
-	end
+    # Misc
+    FEEDBACK_FD = 3
+    PROGRAM_NAME = "Phusion Passenger"
+    SERVER_TOKEN_NAME = "Phusion_Passenger"
+    FLYING_PASSENGER_NAME = "Flying Passenger"
+    INDEX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide.html"
+    APACHE2_DOC_URL     = "https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html"
+    NGINX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
+    STANDALONE_DOC_URL  = "https://www.phusionpassenger.com/documentation/Users%20guide%20Standalone.html"
+    SUPPORT_URL         = "https://www.phusionpassenger.com/documentation_and_support"
+    ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
+    GLOBAL_NAMESPACE_DIRNAME            = PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME_
+    # Subdirectory under $HOME to use for storing stuff.
+    USER_NAMESPACE_DIRNAME              = PhusionPassenger::USER_NAMESPACE_DIRNAME_
+    AGENT_EXE                 = "PassengerAgent"
+    DEB_MAIN_PACKAGE          = "passenger"
+    DEB_DEV_PACKAGE           = "passenger-dev"
+    DEB_APACHE_MODULE_PACKAGE = "libapache2-mod-passenger"
+    DEB_NGINX_PACKAGE         = "nginx-extras"
+    RPM_MAIN_PACKAGE          = "passenger"
+    RPM_DEV_PACKAGE           = "passenger-devel"
+    RPM_APACHE_MODULE_PACKAGE = "mod_passenger"
+    RPM_NGINX_PACKAGE         = "nginx"
+    STANDALONE_NGINX_CONFIGURE_OPTIONS =
+      "--with-cc-opt='-Wno-error' " <<
+      "--without-http_fastcgi_module " <<
+      "--without-http_scgi_module " <<
+      "--without-http_uwsgi_module " <<
+      "--with-http_gzip_static_module " <<
+      "--with-http_stub_status_module " <<
+      "--with-http_ssl_module"
+  end
 
-	SharedConstants.constants.each do |name|
-		const_set(name, SharedConstants.const_get(name)) unless const_defined? name
-	end
+  SharedConstants.constants.each do |name|
+    const_set(name, SharedConstants.const_get(name)) unless const_defined? name
+  end
 end

data/lib/phusion_passenger/debug_logging.rb

@@ -25,111 +25,111 @@ PhusionPassenger.require_passenger_lib 'constants'
 
 module PhusionPassenger
 
-module DebugLogging
-	# We don't refer to STDERR directly because STDERR's reference might
-	# change during runtime.
-	@@log_level = DEFAULT_LOG_LEVEL
-	@@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
-		return @@log_level
-	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)
-		_output(1, message, 1)
-	end
-	module_function :error
-
-	def warn(message)
-		_output(2, message, 1)
-	end
-	module_function :warn
-
-	def notice(message)
-		_output(3, message, 1)
-	end
-	module_function :notice
-
-	def info(message)
-		_output(4, message, 1)
-	end
-	module_function :info
-
-	def debug(message)
-		_output(5, message, 1)
-	end
-	module_function :debug
-
-	def trace(level, message)
-		_output(4 + level, message, 1)
-	end
-	module_function :trace
-
-	def _output(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("%04d", now.usec / 100)
-
-			current_thread = Thread.current
-			if !(thread_id = current_thread[:id])
-				current_thread.to_s =~ /:(0x[0-9a-f]+)/i
-				thread_id = current_thread[:id] = $1 || '?'
-			end
-			if thread_name = current_thread[:name]
-				thread_name = "(#{thread_name})"
-			end
-
-			output.write("[ #{time_str} #{$$}/#{thread_id}#{thread_name} #{location} ]: #{message}\n")
-			output.flush
-		end
-	end
-	module_function :_output
-end
+  module DebugLogging
+    # We don't refer to STDERR directly because STDERR's reference might
+    # change during runtime.
+    @@log_level = DEFAULT_LOG_LEVEL
+    @@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
+      return @@log_level
+    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)
+      _output(1, message, 1)
+    end
+    module_function :error
+
+    def warn(message)
+      _output(2, message, 1)
+    end
+    module_function :warn
+
+    def notice(message)
+      _output(3, message, 1)
+    end
+    module_function :notice
+
+    def info(message)
+      _output(4, message, 1)
+    end
+    module_function :info
+
+    def debug(message)
+      _output(5, message, 1)
+    end
+    module_function :debug
+
+    def trace(level, message)
+      _output(4 + level, message, 1)
+    end
+    module_function :trace
+
+    def _output(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("%04d", now.usec / 100)
+
+        current_thread = Thread.current
+        if !(thread_id = current_thread[:id])
+          current_thread.to_s =~ /:(0x[0-9a-f]+)/i
+          thread_id = current_thread[:id] = $1 || '?'
+        end
+        if thread_name = current_thread[:name]
+          thread_name = "(#{thread_name})"
+        end
+
+        output.write("[ #{time_str} #{$$}/#{thread_id}#{thread_name} #{location} ]: #{message}\n")
+        output.flush
+      end
+    end
+    module_function :_output
+  end
 
 end