passenger 5.0.10 → 5.0.11

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -69,8 +69,8 @@ module PhusionPassenger
 
       def perform_reopen_logs
         perform_reopen_logs_on("watchdog", "watchdog")
-        perform_reinherit_logs_on("server", "server_api")
-        perform_reinherit_logs_on("logger", "logging_api")
+        perform_reinherit_logs_on("core", "core_api")
+        perform_reinherit_logs_on("UstRouter", "ust_router_api")
         puts "All done"
       end
 

data/lib/phusion_passenger/config/restart_app_command.rb

@@ -52,7 +52,8 @@ module PhusionPassenger
           nl = "\n" + ' ' * 37
           opts.banner =
             "Usage 1: passenger-config restart-app <APP PATH PREFIX> [OPTIONS]\n" +
-            "Usage 2: passenger-config restart-app --name <APP GROUP NAME> [OPTIONS]"
+            "Usage 2: passenger-config restart-app . [OPTIONS]\n" +
+            "Usage 3: passenger-config restart-app --name <APP GROUP NAME> [OPTIONS]"
           opts.separator ""
           opts.separator "  Restart an application. The syntax determines how the application that is to"
           opts.separator "  be restarted, will be selected."
@@ -63,7 +64,13 @@ module PhusionPassenger
           opts.separator "     Restarts all apps whose path begin with /webapps, such as /webapps/foo,"
           opts.separator "     /webapps/bar and /webapps123."
           opts.separator ""
-          opts.separator "  2. Selects a specific application based on an exact match of its app group"
+          opts.separator "  2. Selects all application whose paths fall under the current working"
+          opts.separator "     directory."
+          opts.separator "     Example: passenger-config restart-app ."
+          opts.separator "     If the current working directory is /webapps, restarts all apps whose path"
+          opts.separator "     begin with /webapps, such as /webapps/foo, /webapps/bar and /webapps123."
+          opts.separator ""
+          opts.separator "  3. Selects a specific application based on an exact match of its app group"
           opts.separator "     name."
           opts.separator ""
           opts.separator "     Example: passenger-config restart-app --name /webapps/foo"
@@ -187,6 +194,9 @@ module PhusionPassenger
       end
 
       def select_app_group_name_by_app_root_regex(app_root)
+        if app_root == "."
+          app_root = Dir.pwd
+        end
         regex = /^#{Regexp.escape(app_root)}/
         query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
           if group.elements["app_root"].text =~ regex
@@ -240,8 +250,12 @@ module PhusionPassenger
         if response.code.to_i / 100 == 2
           REXML::Document.new(response.body)
         elsif response.code.to_i == 401
-          print_instance_querying_permission_error
-          abort
+          if response["pool-empty"] == "true"
+            REXML::Document.new('<?xml version="1.0" encoding="iso8859-1"?><info version="3"></info>')
+          else
+            print_instance_querying_permission_error
+            abort
+          end
         else
           STDERR.puts "*** An error occured while querying the #{PROGRAM_NAME} server:"
           STDERR.puts response.body

data/lib/phusion_passenger/constants.rb

@@ -49,6 +49,7 @@ module PhusionPassenger
     DEFAULT_NODEJS = "node"
     DEFAULT_MAX_POOL_SIZE = 6
     DEFAULT_POOL_IDLE_TIME = 300
+    DEFAULT_MAX_PRELOADER_IDLE_TIME = 5 * 60
     DEFAULT_START_TIMEOUT = 90_000
     DEFAULT_WEB_APP_USER = "nobody"
     DEFAULT_APP_ENV = "production"
@@ -66,8 +67,8 @@ module PhusionPassenger
     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_API_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
+    DEFAULT_UST_ROUTER_LISTEN_ADDRESS = "tcp://127.0.0.1:9344"
+    DEFAULT_UST_ROUTER_API_LISTEN_ADDRESS = "tcp://127.0.0.1:9345"
 
     # Size limits
     MESSAGE_SERVER_MAX_USERNAME_SIZE = 100
@@ -87,8 +88,8 @@ module PhusionPassenger
     PASSENGER_API_VERSION_MINOR = 2
     PASSENGER_API_VERSION = "#{PASSENGER_API_VERSION_MAJOR}.#{PASSENGER_API_VERSION_MINOR}"
     SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 2
-    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 1
-    SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION = 1
+    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 3
+    SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION = 3
 
     # Misc
     FEEDBACK_FD = 3
@@ -121,7 +122,8 @@ module PhusionPassenger
       "--without-http_uwsgi_module " <<
       "--with-http_gzip_static_module " <<
       "--with-http_stub_status_module " <<
-      "--with-http_ssl_module"
+      "--with-http_ssl_module " <<
+      "--with-http_realip_module"
   end
 
   SharedConstants.constants.each do |name|

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -164,7 +164,7 @@ module PhusionPassenger
     def dump_system_metrics(options)
       if dir = ENV['PASSENGER_DEBUG_DIR']
         # When invoked through Passenger Standalone, we want passenger-config
-        # to use the HelperAgent in the Passsenger Standalone buildout directory,
+        # to use the PassengerAgent in the Passsenger Standalone buildout directory,
         # because the one in the source root may not exist.
         passenger_config = "#{PhusionPassenger.bin_dir}/passenger-config"
         if is_ruby_program?(passenger_config)
@@ -291,11 +291,7 @@ module PhusionPassenger
     # This method is to be called after loading the application code but
     # before forking a worker process.
     def after_loading_app_code(options)
-      # Post-install framework extensions. Possibly preceded by a call to
-      # PhusionPassenger.install_framework_extensions!
-      if defined?(::Rails) && !defined?(::Rails::VERSION)
-        require 'rails/version'
-      end
+      # Do nothing.
     end
 
     def create_socket_address(protocol, address)

data/lib/phusion_passenger/message_client.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  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.
 #
@@ -34,7 +34,7 @@ module PhusionPassenger
     include Utils
 
     # Connect to the given server. By default it connects to the current
-    # generation's helper server.
+    # generation's core.
     def initialize(username, password, address)
       @socket = connect_to_server(address)
       begin
@@ -73,7 +73,7 @@ module PhusionPassenger
       return !!@channel
     end
 
-    ### HelperAgent methods ###
+    ### Passenger core process methods ###
 
     def pool_detach_process(pid)
       write("detach_process", pid)
@@ -123,23 +123,23 @@ module PhusionPassenger
       end
     end
 
-    def helper_agent_requests
+    def core_requests
       write("requests")
       check_security_response
       return read_scalar
     end
 
-    ### HelperAgent BacktracesServer methods ###
+    ### Passenger core BacktracesServer methods ###
 
-    def helper_agent_backtraces
+    def core_backtraces
       write("backtraces")
       check_security_response
       return read_scalar
     end
 
-    ### LoggingAgent AdminServer methods ###
+    ### Passenger UstRouter AdminServer methods ###
 
-    def logging_agent_status
+    def ust_router_status
       write("status")
       check_security_response
       return read_scalar

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -221,9 +221,8 @@ module PhusionPassenger
     def self.rvm_paths
       if in_rvm?
         result = []
-        [ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
+        [ENV['rvm_path'], "#{PhusionPassenger.home_dir}/.rvm", "/usr/local/rvm"].each do |path|
           next if path.nil?
-          path = File.expand_path(path)
           rubies_path = File.join(path, 'rubies')
           wrappers_path = File.join(path, 'wrappers')
           gems_path = File.join(path, 'gems')

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -123,7 +123,7 @@ module PhusionPassenger
       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.
+      # ready because the Passenger core will read and memorize this information.
       LoaderSharedHelpers.dump_all_information(options)
 
       puts "!> Ready"

data/lib/phusion_passenger/request_handler.rb

@@ -257,7 +257,7 @@ module PhusionPassenger
       # when we know EOF is not reached.
       #
       # The ApplicationPool infrastructure used to connect to a backend
-      # process's Unix socket in the helper server process, and then
+      # process's Unix socket in the Passenger core process, and then
       # pass the connection file descriptor to the web server, which
       # triggers this kernel bug. We used to work around this by using
       # TCP sockets instead of Unix sockets; TCP sockets can still fail
@@ -265,7 +265,7 @@ module PhusionPassenger
       # as with Unix sockets.
       #
       # This problem no longer applies today. The web server now passes
-      # all I/O through the HelperAgent, and the bug is no longer
+      # all I/O through the Passenger core, and the bug is no longer
       # triggered. Nevertheless, we keep this function intact so that
       # if something like this ever happens again, we know why, and we
       # can easily reactivate the workaround. Or maybe if we just need
@@ -344,6 +344,7 @@ module PhusionPassenger
 
       trap('ABRT') do
         print_status_report
+        abort
       end if trappable_signals.has_key?('ABRT')
       trap('QUIT') do
         print_status_report

data/lib/phusion_passenger/request_handler/thread_handler.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.
 #
@@ -380,7 +380,7 @@ module PhusionPassenger
             end
           rescue Exception
             # Maybe this exception was raised while communicating
-            # with the logging agent. If that is the case then
+            # with the UstRouter. If that is the case then
             # transaction.close may also raise an exception, but we're only
             # interested in the original exception. So if this
             # situation occurs we must ignore any exceptions raised
@@ -389,9 +389,9 @@ module PhusionPassenger
             raise
           ensure
             # It is important that the following call receives an ACK
-            # from the logging agent and that we don't close the socket
+            # from the UstRouter and that we don't close the socket
             # connection until the ACK has been received, otherwise
-            # the helper agent may close the transaction before this
+            # the Passenger core may close the transaction before this
             # process's openTransaction command is processed.
             begin
               transaction.close

data/lib/phusion_passenger/standalone/start_command.rb

@@ -165,7 +165,7 @@ module PhusionPassenger
           end
           opts.on("--data-buffer-dir PATH", String,
             "Use the given data buffer directory") do |value|
-            # relative values OK (absolutizePath in HelperAgent Main)
+            # relative values OK (absolutizePath in Passenger core main)
             options[:data_buffer_dir] = value
           end
 
@@ -252,6 +252,12 @@ module PhusionPassenger
             "Default: #{DEFAULT_POOL_IDLE_TIME}") do |value|
             options[:pool_idle_time] = value
           end
+          opts.on("--max-preloader-idle-time SECONDS", Integer,
+            "Maximum time that preloader processes may#{nl}" +
+            "be idle. A value of 0 means that preloader#{nl}" +
+            "processes never timeout. Default: #{DEFAULT_MAX_PRELOADER_IDLE_TIME}") do |value|
+            options[:max_preloader_idle_time] = value
+          end
           opts.on("--concurrency-model NAME", String,
             "The concurrency model to use, either#{nl}" +
             "'process' or 'thread' (Enterprise only).#{nl}" +
@@ -287,7 +293,8 @@ module PhusionPassenger
             options[:sticky_sessions_cookie_name] = value
           end
           opts.on("--vary-turbocache-by-cookie NAME", String,
-            "Vary the turbocache by the cookie of the given name") do |value|
+            "Vary the turbocache by the cookie of the#{nl}" +
+            "given name") do |value|
             options[:vary_turbocache_by_cookie] = value
           end
           opts.on("--disable-turbocaching", "Disable turbocaching") do
@@ -386,7 +393,7 @@ module PhusionPassenger
         if app_dir
           begin
             ConfigUtils.load_local_config_file!(app_dir, @local_options)
-          rescue ConfigLoadError => e
+          rescue ConfigUtils::ConfigLoadError => e
             abort "*** ERROR: #{e.message}"
           end
         end
@@ -554,6 +561,9 @@ module PhusionPassenger
         else
           options[:log_file] ||= "#{exec_root}/#{log_basename}"
         end
+
+        options[:log_file] = File.expand_path(options[:log_file], exec_root)
+        options[:pid_file] = File.expand_path(options[:pid_file], exec_root)
       end
 
       def create_working_dir

data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -113,7 +113,7 @@ module PhusionPassenger
             command << " --default-user #{Shellwords.escape user}"
           end
 
-          command << " --BS"
+          command << " --BC"
           command << " --listen #{listen_address}"
           command << " --no-graceful-exit"
           add_param(command, :environment, "--environment")
@@ -135,6 +135,7 @@ module PhusionPassenger
           add_param(command, :max_pool_size, "--max-pool-size")
           add_param(command, :min_instances, "--min-instances")
           add_param(command, :pool_idle_time, "--pool-idle-time")
+          add_param(command, :max_preloader_idle_time, "--max-preloader-idle-time")
           add_enterprise_param(command, :concurrency_model, "--concurrency-model")
           add_enterprise_param(command, :thread_count, "--app-thread-count")
           add_enterprise_param(command, :max_request_time, "--max-request-time")

data/lib/phusion_passenger/union_station/core.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.
 #
@@ -40,10 +40,10 @@ module PhusionPassenger
       include DebugLogging
 
       def self.new_from_options(options)
-        if options["analytics"] && options["logging_agent_address"]
-          return new(options["logging_agent_address"],
-            options["logging_agent_username"],
-            options["logging_agent_password"],
+        if options["analytics"] && options["ust_router_address"]
+          return new(options["ust_router_address"],
+            options["ust_router_username"],
+            options["ust_router_password"],
             options["node_name"])
         else
           return nil
@@ -53,8 +53,8 @@ module PhusionPassenger
       attr_accessor :max_connect_tries
       attr_accessor :reconnect_timeout
 
-      def initialize(logging_agent_address, username, password, node_name)
-        @server_address = logging_agent_address
+      def initialize(ust_router_address, username, password, node_name)
+        @server_address = ust_router_address
         @username = username
         @password = password
         if node_name && !node_name.empty?
@@ -120,7 +120,7 @@ module PhusionPassenger
                 connection_lock.reset(@connection.mutex)
               rescue SystemCallError, IOError
                 @connection.disconnect
-                warn("Cannot connect to the logging agent at #{@server_address}; " +
+                warn("Cannot connect to the UstRouter at #{@server_address}; " +
                   "retrying in #{@reconnect_timeout} second(s).")
                 @next_reconnect_time = current_time + @reconnect_timeout
                 return Transaction.new
@@ -139,12 +139,12 @@ module PhusionPassenger
                 true)
               result = @connection.channel.read
               if result != ["ok"]
-                raise "Expected logging server to respond with 'ok', but got #{result.inspect} instead"
+                raise "Expected the UstRouter to respond with 'ok', but got #{result.inspect} instead"
               end
               return Transaction.new(@connection, txn_id)
             rescue SystemCallError, IOError
               @connection.disconnect
-              warn("The logging agent at #{@server_address}" <<
+              warn("The UstRouter at #{@server_address}" <<
                 " closed the connection; will reconnect in " <<
                 "#{@reconnect_timeout} second(s).")
               @next_reconnect_time = current_time + @reconnect_timeout
@@ -176,7 +176,7 @@ module PhusionPassenger
                 connection_lock.reset(@connection.mutex)
               rescue SystemCallError, IOError
                 @connection.disconnect
-                warn("Cannot connect to the logging agent at #{@server_address}; " +
+                warn("Cannot connect to the UstRouter at #{@server_address}; " +
                   "retrying in #{@reconnect_timeout} second(s).")
                 @next_reconnect_time = current_time + @reconnect_timeout
                 return Transaction.new
@@ -195,7 +195,7 @@ module PhusionPassenger
               return Transaction.new(@connection, txn_id)
             rescue SystemCallError, IOError
               @connection.disconnect
-              warn("The logging agent at #{@server_address}" <<
+              warn("The UstRouter at #{@server_address}" <<
                 " closed the connection; will reconnect in " <<
                 "#{@reconnect_timeout} second(s).")
               @next_reconnect_time = current_time + @reconnect_timeout
@@ -223,9 +223,9 @@ module PhusionPassenger
         if result.nil?
           raise EOFError
         elsif result.size != 2 || result[0] != "version"
-          raise IOError, "The logging agent didn't sent a valid version identifier"
+          raise IOError, "The UstRouter didn't sent a valid version identifier"
         elsif result[1] != "1"
-          raise IOError, "Unsupported logging agent protocol version #{result[1]}"
+          raise IOError, "Unsupported UstRouter protocol version #{result[1]}"
         end
 
         channel.write_scalar(@username)
@@ -241,13 +241,13 @@ module PhusionPassenger
         channel.write("init", @node_name)
         args = channel.read
         if !args
-          raise Errno::ECONNREFUSED, "Cannot connect to logging agent"
+          raise Errno::ECONNREFUSED, "Cannot connect to UstRouter"
         elsif args.size != 1
-          raise IOError, "Logging agent returned an invalid reply for the 'init' command"
+          raise IOError, "UstRouter returned an invalid reply for the 'init' command"
         elsif args[0] == "server shutting down"
-          raise Errno::ECONNREFUSED, "Cannot connect to logging agent"
+          raise Errno::ECONNREFUSED, "Cannot connect to UstRouter"
         elsif args[0] != "ok"
-          raise IOError, "Logging agent returned an invalid reply for the 'init' command"
+          raise IOError, "UstRouter returned an invalid reply for the 'init' command"
         end
 
         @connection.unref

data/lib/phusion_passenger/union_station/transaction.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.
 #
@@ -60,7 +60,7 @@ module PhusionPassenger
             @connection.channel.write_scalar(text)
           rescue SystemCallError, IOError => e
             @connection.disconnect
-            warn("Error communicating with the logging agent: #{e.message}")
+            warn("Error communicating with the UstRouter: #{e.message}")
           rescue Exception => e
             @connection.disconnect
             raise e
@@ -125,18 +125,18 @@ module PhusionPassenger
               Core.timestamp_string, true)
             result = @connection.channel.read
             if result != ["ok"]
-              raise "Expected logging agent to respond with 'ok', but got #{result.inspect} instead"
+              raise "Expected UstRouter to respond with 'ok', but got #{result.inspect} instead"
             end
             if flush_to_disk
               @connection.channel.write("flush")
               result = @connection.channel.read
               if result != ["ok"]
-                raise "Invalid logging agent response #{result.inspect} to the 'flush' command"
+                raise "Invalid UstRouter response #{result.inspect} to the 'flush' command"
               end
             end
           rescue SystemCallError, IOError => e
             @connection.disconnect
-            warn("Error communicating with the logging agent: #{e.message}")
+            warn("Error communicating with the UstRouter: #{e.message}")
           rescue Exception => e
             @connection.disconnect
             raise e