passenger 5.3.4 → 6.0.1

data/src/agent/Core/ApplicationPool/Options.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -30,7 +30,7 @@
 #include <vector>
 #include <utility>
 #include <boost/shared_array.hpp>
-#include <AppTypes.h>
+#include <WrapperRegistry/Registry.h>
 #include <DataStructures/HashedStaticString.h>
 #include <Constants.h>
 #include <ResourceLocator.h>
@@ -85,7 +85,7 @@ private:
 		result.push_back(&options.appGroupName);
 		result.push_back(&options.appLogFile);
 		result.push_back(&options.appType);
-		result.push_back(&options.startCommand);
+		result.push_back(&options.appStartCommand);
 		result.push_back(&options.startupFile);
 		result.push_back(&options.processTitle);
 
@@ -181,15 +181,15 @@ public:
 	/** The application's type, used for determining the command to invoke to
 	 * spawn an application process as well as determining the startup file's
 	 * filename. It can be one of the app type names in AppType.cpp, or the
-	 * empty string (default). In case of the latter, 'startCommand' and
+	 * empty string (default). In case of the latter, 'appStartCommand' and
 	 * 'startupFile' (which MUST be set) will dictate the startup command
 	 * and the startup file's filename. */
 	StaticString appType;
 
-	/** The command for spawning the application process. This is a list of
-	 * arguments, separated by '\t', e.g. "ruby\tfoo.rb". Only used
-	 * during spawning and only if appType.empty(). */
-	StaticString startCommand;
+	/** The shell command string for spawning the application process.
+	 * Only used during spawning and only if appType.empty().
+	 */
+	StaticString appStartCommand;
 
 	/** Filename of the application's startup file. Only actually used for
 	 * determining user switching info. Only used during spawning. */
@@ -545,16 +545,16 @@ public:
 	 * the `elements` argument.
 	 */
 	void toVector(vector<string> &vec, const ResourceLocator &resourceLocator,
-		int fields = ALL_OPTIONS) const
+		const WrapperRegistry::Registry &wrapperRegistry, int fields = ALL_OPTIONS) const
 	{
 		if (fields & SPAWN_OPTIONS) {
 			appendKeyValue (vec, "app_root",           appRoot);
 			appendKeyValue (vec, "app_group_name",     getAppGroupName());
 			appendKeyValue (vec, "app_type",           appType);
 			appendKeyValue (vec, "app_log_file",       appLogFile);
-			appendKeyValue (vec, "start_command",      getStartCommand(resourceLocator));
-			appendKeyValue (vec, "startup_file",       absolutizePath(getStartupFile(), absolutizePath(appRoot)));
-			appendKeyValue (vec, "process_title",      getProcessTitle());
+			appendKeyValue (vec, "start_command",      getStartCommand(resourceLocator, wrapperRegistry));
+			appendKeyValue (vec, "startup_file",       absolutizePath(getStartupFile(wrapperRegistry), absolutizePath(appRoot)));
+			appendKeyValue (vec, "process_title",      getProcessTitle(wrapperRegistry));
 			appendKeyValue2(vec, "log_level",          logLevel);
 			appendKeyValue3(vec, "start_timeout",      startTimeout);
 			appendKeyValue (vec, "environment",        environment);
@@ -589,12 +589,12 @@ public:
 
 	template<typename Stream>
 	void toXml(Stream &stream, const ResourceLocator &resourceLocator,
-		int fields = ALL_OPTIONS) const
+		const WrapperRegistry::Registry &wrapperRegistry, int fields = ALL_OPTIONS) const
 	{
 		vector<string> args;
 		unsigned int i;
 
-		toVector(args, resourceLocator, fields);
+		toVector(args, resourceLocator, wrapperRegistry, fields);
 		for (i = 0; i < args.size(); i += 2) {
 			stream << "<" << args[i] << ">";
 			stream << escapeForXml(args[i + 1]);
@@ -614,43 +614,47 @@ public:
 		}
 	}
 
-	string getStartCommand(const ResourceLocator &resourceLocator) const {
-		if (appType == P_STATIC_STRING("rack")) {
-			return escapeShell(ruby) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/rack-loader.rb");
-		} else if (appType == P_STATIC_STRING("wsgi")) {
-			return escapeShell(python) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py");
-		} else if (appType == P_STATIC_STRING("node")) {
-			return escapeShell(nodejs) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/node-loader.js");
-		} else if (appType == P_STATIC_STRING("meteor")) {
-			return escapeShell(ruby) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb");
+	string getStartCommand(const ResourceLocator &resourceLocator,
+		const WrapperRegistry::Registry &wrapperRegistry) const
+	{
+		const WrapperRegistry::Entry &entry = wrapperRegistry.lookup(appType);
+
+		string interpreter;
+		if (entry.language == P_STATIC_STRING("ruby")) {
+			interpreter = escapeShell(ruby);
+		} else if (entry.language == P_STATIC_STRING("python")) {
+			interpreter = escapeShell(python);
+		} else if (entry.language == P_STATIC_STRING("nodejs")) {
+			interpreter = escapeShell(nodejs);
+		} else if (entry.language == P_STATIC_STRING("meteor")) {
+			interpreter = escapeShell(ruby);
 		} else {
-			return startCommand;
+			return appStartCommand;
 		}
+
+		return interpreter + " " + escapeShell(resourceLocator.getHelperScriptsDir()
+			+ "/" + entry.path);
 	}
 
-	StaticString getStartupFile() const {
+	StaticString getStartupFile(const WrapperRegistry::Registry &wrapperRegistry) const {
 		if (startupFile.empty()) {
-			const char *result = getAppTypeStartupFile(getAppType(appType));
-			if (result == NULL) {
-				return P_STATIC_STRING("");
+			const WrapperRegistry::Entry &entry = wrapperRegistry.lookup(appType);
+			if (entry.isNull() || entry.defaultStartupFiles.empty()) {
+				return StaticString();
 			} else {
-				return result;
+				return entry.defaultStartupFiles[0];
 			}
 		} else {
 			return startupFile;
 		}
 	}
 
-	StaticString getProcessTitle() const {
-		const char *result = getAppTypeProcessTitle(getAppType(appType));
-		if (result == NULL) {
-			return processTitle;
+	StaticString getProcessTitle(const WrapperRegistry::Registry &registry) const {
+		const WrapperRegistry::Entry &entry = registry.lookup(appType);
+		if (entry.isNull()) {
+			return entry.processTitle;
 		} else {
-			return result;
+			return StaticString();
 		}
 	}
 

data/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp

@@ -52,7 +52,8 @@ Pool::getGroupRunUidAndGids(const StaticString &appGroupName) {
 	if (!groups.lookup(appGroupName.c_str(), &group)) {
 		throw RuntimeException("Could not find group: " + appGroupName);
 	} else {
-		SpawningKit::UserSwitchingInfo info = SpawningKit::prepareUserSwitching((*group)->options);
+		SpawningKit::UserSwitchingInfo info = SpawningKit::prepareUserSwitching((*group)->options,
+			*context->getWrapperRegistry());
 		return pair<uid_t, gid_t>(info.uid,info.gid);
 	}
 }

data/src/agent/Core/ApplicationPool/Pool.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -52,13 +52,13 @@
 #include <ConfigKit/ConfigKit.h>
 #include <Exceptions.h>
 #include <Hooks.h>
+#include <SystemTools/SystemMetricsCollector.h>
+#include <SystemTools/ProcessMetricsCollector.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/Lock.h>
 #include <Utils/AnsiColorConstants.h>
-#include <Utils/SystemTime.h>
 #include <Utils/MessagePassing.h>
 #include <Utils/VariantMap.h>
-#include <Utils/ProcessMetricsCollector.h>
-#include <Utils/SystemMetricsCollector.h>
 #include <Core/ApplicationPool/Common.h>
 #include <Core/ApplicationPool/Context.h>
 #include <Core/ApplicationPool/Process.h>

data/src/agent/Core/ApplicationPool/Process.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -43,10 +43,10 @@
 #include <Constants.h>
 #include <FileDescriptor.h>
 #include <LoggingKit/LoggingKit.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/ProcessMetricsCollector.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/Lock.h>
-#include <Utils/ProcessMetricsCollector.h>
 #include <Core/ApplicationPool/Common.h>
 #include <Core/ApplicationPool/Socket.h>
 #include <Core/ApplicationPool/Session.h>
@@ -156,12 +156,7 @@ private:
 	 */
 	unsigned long long spawnEndTime;
 
-	/**
-	 * If true, then indicates that this Process does not refer to a real OS
-	 * process. The sockets in the socket list are fake and need not be deleted,
-	 * the admin socket need not be closed, etc.
-	 */
-	bool dummy;
+	SpawningKit::Result::Type type;
 
 	/**
 	 * Whether it is required that triggerShutdown() and cleanup() must be called
@@ -458,7 +453,7 @@ public:
 		  spawnerCreationTime(getJsonUint64Field(args, "spawner_creation_time")),
 		  spawnStartTime(getJsonUint64Field(args, "spawn_start_time")),
 		  spawnEndTime(SystemTime::getUsec()),
-		  dummy(args["type"] == "dummy"),
+		  type(args["type"] == "dummy" ? SpawningKit::Result::DUMMY : SpawningKit::Result::UNKNOWN),
 		  requiresShutdown(false),
 		  refcount(1),
 		  index(-1),
@@ -483,7 +478,7 @@ public:
 		  spawnerCreationTime(getJsonUint64Field(args, "spawner_creation_time")),
 		  spawnStartTime(skResult.spawnStartTime),
 		  spawnEndTime(skResult.spawnEndTime),
-		  dummy(skResult.dummy),
+		  type(skResult.type),
 		  requiresShutdown(false),
 		  refcount(1),
 		  index(-1),
@@ -606,6 +601,9 @@ public:
 		if (inputPipe != -1) {
 			inputPipe.close();
 		}
+		if (type == SpawningKit::Result::GENERIC) {
+			syscalls::kill(getPid(), SIGTERM);
+		}
 	}
 
 	bool shutdownTimeoutExpired() const {
@@ -620,7 +618,7 @@ public:
 		assert(canCleanup());
 
 		P_TRACE(2, "Cleaning up process " << inspect());
-		if (!dummy) {
+		if (type != SpawningKit::Result::DUMMY) {
 			SocketList::iterator it, end = sockets.end();
 			for (it = sockets.begin(); it != end; it++) {
 				if (getSocketAddressType(it->address) == SAT_UNIX) {
@@ -676,7 +674,7 @@ public:
 	}
 
 	bool isDummy() const {
-		return dummy;
+		return type == SpawningKit::Result::DUMMY;
 	}
 
 
@@ -720,7 +718,7 @@ public:
 	 * same PID.
 	 */
 	bool osProcessExists() const {
-		if (!dummy && m_osProcessExists) {
+		if (type != SpawningKit::Result::DUMMY && m_osProcessExists) {
 			if (syscalls::kill(getPid(), 0) == 0) {
 				/* On some environments, e.g. Heroku, the init process does
 				 * not properly reap adopted zombie processes, which can interfere

data/src/agent/Core/ApplicationPool/Socket.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -31,13 +31,13 @@
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/container/small_vector.hpp>
 #include <climits>
 #include <cassert>
-#include <SmallVector.h>
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
 #include <MemoryKit/palloc.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Core/ApplicationPool/Common.h>
 
 namespace Passenger {
@@ -253,7 +253,7 @@ public:
 	}
 
 	bool isTotallyBusy() const {
-		return concurrency != 0 && sessions >= concurrency;
+		return concurrency > 0 && sessions >= concurrency;
 	}
 
 	void recreateStrings(psg_pool_t *newPool) {
@@ -263,7 +263,7 @@ public:
 	}
 };
 
-class SocketList: public SmallVector<Socket, 1> {
+class SocketList: public boost::container::small_vector<Socket, 1> {
 public:
 	void add(pid_t pid, const StaticString &address, const StaticString &protocol,
 		const StaticString &description, int concurrency, bool acceptHttpRequests)

data/src/agent/Core/ApplicationPool/TestSession.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2017 Phusion Holding B.V.
+ *  Copyright (c) 2016-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -29,8 +29,8 @@
 #include <boost/thread.hpp>
 #include <string>
 #include <cassert>
-#include <Utils/IOUtils.h>
-#include <Utils/BufferedIO.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/BufferedIO.h>
 #include <Core/ApplicationPool/AbstractSession.h>
 
 namespace Passenger {

data/src/agent/Core/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -41,14 +41,16 @@
 #include <ConfigKit/PrefixTranslator.h>
 #include <ServerKit/Context.h>
 #include <ServerKit/HttpServer.h>
+#include <WrapperRegistry/Registry.h>
 #include <Core/Controller/Config.h>
 #include <Core/SecurityUpdateChecker.h>
+#include <Core/TelemetryCollector.h>
 #include <Core/ApiServer.h>
 #include <Core/AdminPanelConnector.h>
 #include <Shared/ApiAccountUtils.h>
 #include <Constants.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 
 namespace Passenger {
 namespace Core {
@@ -143,6 +145,7 @@ using namespace std;
  *   max_instances_per_app                                           unsigned integer   -          read_only
  *   max_pool_size                                                   unsigned integer   -          default(6)
  *   multi_app                                                       boolean            -          default(false),read_only
+ *   oom_score                                                       string             -          read_only
  *   passenger_root                                                  string             required   read_only
  *   pid_file                                                        string             -          read_only
  *   pool_idle_time                                                  unsigned integer   -          default(300)
@@ -154,13 +157,25 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/5.3.4")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.1")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
+ *   single_app_mode_app_start_command                               string             -          read_only
  *   single_app_mode_app_type                                        string             -          read_only
  *   single_app_mode_startup_file                                    string             -          read_only
  *   standalone_engine                                               string             -          default
  *   stat_throttle_rate                                              unsigned integer   -          default(10)
+ *   telemetry_collector_ca_certificate_path                         string             -          -
+ *   telemetry_collector_debug_curl                                  boolean            -          default(false)
+ *   telemetry_collector_disabled                                    boolean            -          default(false)
+ *   telemetry_collector_final_run_timeout                           unsigned integer   -          default(5)
+ *   telemetry_collector_first_interval                              unsigned integer   -          default(7200)
+ *   telemetry_collector_interval                                    unsigned integer   -          default(21600)
+ *   telemetry_collector_interval_jitter                             unsigned integer   -          default(7200)
+ *   telemetry_collector_proxy_url                                   string             -          -
+ *   telemetry_collector_timeout                                     unsigned integer   -          default(180)
+ *   telemetry_collector_url                                         string             -          default("https://anontelemetry.phusionpassenger.com/v1/collect.json")
+ *   telemetry_collector_verify_server                               boolean            -          default(true)
  *   turbocaching                                                    boolean            -          default(true),read_only
  *   user_switching                                                  boolean            -          default(true)
  *   vary_turbocache_by_cookie                                       string             -          -
@@ -239,19 +254,27 @@ private:
 			errors.push_back(Error("If '{{multi_app_mode}}' is set,"
 				" then '{{single_app_mode_startup_file}}' may not be set"));
 		}
+		if (!config["single_app_mode_app_start_command"].isNull()) {
+			errors.push_back(Error("If '{{multi_app_mode}}' is set,"
+				" then '{{single_app_mode_app_start_command}}' may not be set"));
+		}
 	}
 
-	static void validateSingleAppMode(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
+	static void validateSingleAppMode(const ConfigKit::Store &config,
+		const WrapperRegistry::Registry *wrapperRegistry, vector<ConfigKit::Error> &errors)
+	{
 		typedef ConfigKit::Error Error;
 
 		if (config["multi_app"].asBool()) {
 			return;
 		}
 
-		// single_app_mode_app_type and single_app_mode_startup_file are
-		// autodetected in initializeSingleAppMode()
+		// single_app_mode_app_type, single_app_mode_startup_file and
+		// single_app_mode_app_start_command are autodetected in
+		// initializeSingleAppMode() so no need to validate them.
 
-		ControllerSingleAppModeSchema::validateAppType("single_app_mode_app_type", config, errors);
+		ControllerSingleAppModeSchema::validateAppType("single_app_mode_app_type",
+			wrapperRegistry, config, errors);
 	}
 
 	static void validateControllerSecureHeadersPassword(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
@@ -348,9 +371,13 @@ public:
 		ControllerSchema schema;
 		ConfigKit::TableTranslator translator;
 	} controller;
-	struct {
+	struct ControllerSingleAppModeSubschemaContainer {
 		ControllerSingleAppModeSchema schema;
 		ConfigKit::PrefixTranslator translator;
+
+		ControllerSingleAppModeSubschemaContainer(const WrapperRegistry::Registry *registry)
+			: schema(registry)
+			{ }
 	} controllerSingleAppMode;
 	struct {
 		ServerKit::Schema schema;
@@ -360,6 +387,10 @@ public:
 		SecurityUpdateChecker::Schema schema;
 		ConfigKit::PrefixTranslator translator;
 	} securityUpdateChecker;
+	struct {
+		TelemetryCollector::Schema schema;
+		ConfigKit::PrefixTranslator translator;
+	} telemetryCollector;
 	struct {
 		ApiServer::Schema schema;
 		ConfigKit::TableTranslator translator;
@@ -373,7 +404,9 @@ public:
 		ConfigKit::TableTranslator translator;
 	} adminPanelConnector;
 
-	Schema() {
+	Schema(const WrapperRegistry::Registry *wrapperRegistry = NULL)
+		: controllerSingleAppMode(wrapperRegistry)
+	{
 		using namespace ConfigKit;
 
 		// Add subschema: loggingKit
@@ -398,6 +431,7 @@ public:
 			ControllerSingleAppModeSchema::getDefaultAppRoot);
 		add("single_app_mode_app_type", STRING_TYPE, OPTIONAL | READ_ONLY);
 		add("single_app_mode_startup_file", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("single_app_mode_app_start_command", STRING_TYPE, OPTIONAL | READ_ONLY);
 
 		// Add subschema: controllerServerKit
 		controllerServerKit.translator.setPrefixAndFinalize("controller_");
@@ -410,6 +444,10 @@ public:
 		erase("security_update_checker_server_identifier");
 		erase("security_update_checker_web_server_version");
 
+		// Add subschema: telemetryCollector
+		telemetryCollector.translator.setPrefixAndFinalize("telemetry_collector_");
+		addSubSchema(telemetryCollector.schema, telemetryCollector.translator);
+
 		// Add subschema: apiServer
 		apiServer.translator.add("api_server_authorizations", "authorizations");
 		addSubSchemaPrefixTranslations<ServerKit::HttpServerSchema>(
@@ -440,6 +478,7 @@ public:
 		add("config_manifest", OBJECT_TYPE, OPTIONAL | READ_ONLY);
 		add("pid_file", STRING_TYPE, OPTIONAL | READ_ONLY);
 		add("web_server_version", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("oom_score", STRING_TYPE, OPTIONAL | READ_ONLY);
 		addWithDynamicDefault("controller_threads", UINT_TYPE, OPTIONAL | READ_ONLY, getDefaultThreads);
 		add("max_pool_size", UINT_TYPE, OPTIONAL, DEFAULT_MAX_POOL_SIZE);
 		add("pool_idle_time", UINT_TYPE, OPTIONAL, Json::UInt(DEFAULT_POOL_IDLE_TIME));
@@ -453,7 +492,8 @@ public:
 		add("file_descriptor_ulimit", UINT_TYPE, OPTIONAL | READ_ONLY, 0);
 
 		addValidator(validateMultiAppMode);
-		addValidator(validateSingleAppMode);
+		addValidator(boost::bind(validateSingleAppMode, boost::placeholders::_1,
+			wrapperRegistry, boost::placeholders::_2));
 		addValidator(validateControllerSecureHeadersPassword);
 		addValidator(validateApplicationPool);
 		addValidator(validateController);

data/src/agent/Core/ConfigChange.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -49,6 +49,7 @@ struct ConfigChangeRequest {
 	boost::scoped_ptr<ConfigKit::Store> config;
 	LoggingKit::ConfigChangeRequest forLoggingKit;
 	SecurityUpdateChecker::ConfigChangeRequest forSecurityUpdateChecker;
+	TelemetryCollector::ConfigChangeRequest forTelemetryCollector;
 	vector<ServerKit::ConfigChangeRequest *> forControllerServerKit;
 	vector<Controller::ConfigChangeRequest *> forController;
 	ServerKit::ConfigChangeRequest forApiServerKit;
@@ -188,6 +189,13 @@ asyncPrepareConfigChange(const Json::Value &updates, ConfigChangeRequest *req,
 		coreSchema->securityUpdateChecker.translator,
 		req->config->inspectEffectiveValues(),
 		req->errors, req->forSecurityUpdateChecker);
+	if (workingObjects->telemetryCollector != NULL) {
+		ConfigKit::prepareConfigChangeForSubComponent(
+			*workingObjects->telemetryCollector,
+			coreSchema->telemetryCollector.translator,
+			req->config->inspectEffectiveValues(),
+			req->errors, req->forTelemetryCollector);
+	}
 
 	req->forControllerServerKit.resize(wo->threadWorkingObjects.size(), NULL);
 	req->forController.resize(wo->threadWorkingObjects.size(), NULL);
@@ -287,6 +295,10 @@ asyncCommitConfigChange(ConfigChangeRequest *req, const CommitConfigChangeCallba
 	LoggingKit::context->commitConfigChange(req->forLoggingKit);
 	workingObjects->securityUpdateChecker->commitConfigChange(
 		req->forSecurityUpdateChecker);
+	if (workingObjects->telemetryCollector != NULL) {
+		workingObjects->telemetryCollector->commitConfigChange(
+			req->forTelemetryCollector);
+	}
 
 	wo->appPool->setMax(coreConfig->get("max_pool_size").asInt());
 	wo->appPool->setMaxIdleTime(coreConfig->get("pool_idle_time").asInt() * 1000000ULL);

data/src/agent/Core/Controller/Config.h

@@ -39,7 +39,7 @@
 #include <MemoryKit/palloc.h>
 #include <ServerKit/HttpServer.h>
 #include <SystemTools/UserDatabase.h>
-#include <AppTypes.h>
+#include <WrapperRegistry/Registry.h>
 #include <Constants.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -113,7 +113,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/5.3.4")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.1")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -223,22 +223,25 @@ public:
  * (do not edit: following text is automatically generated
  * by 'rake configkit_schemas_inline_comments')
  *
- *   app_root       string   -          default,read_only
- *   app_type       string   required   read_only
- *   startup_file   string   required   read_only
+ *   app_root            string   -   default,read_only
+ *   app_start_command   string   -   read_only
+ *   app_type            string   -   read_only
+ *   startup_file        string   -   read_only
  *
  * END
  */
 struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
-	ControllerSingleAppModeSchema() {
+	ControllerSingleAppModeSchema(const WrapperRegistry::Registry *wrapperRegistry = NULL) {
 		using namespace ConfigKit;
 
 		addWithDynamicDefault("app_root", STRING_TYPE, OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE,
 			getDefaultAppRoot);
-		add("app_type", STRING_TYPE, REQUIRED | READ_ONLY);
-		add("startup_file", STRING_TYPE, REQUIRED | READ_ONLY);
+		add("app_type", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("startup_file", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("app_start_command", STRING_TYPE, OPTIONAL | READ_ONLY);
 
-		addValidator(boost::bind(validateAppType, "app_type",
+		addValidator(validateAppTypeOrAppStartCommandSet);
+		addValidator(boost::bind(validateAppType, "app_type", wrapperRegistry,
 			boost::placeholders::_1, boost::placeholders::_2));
 		addNormalizer(normalizeAppRoot);
 		addNormalizer(normalizeStartupFile);
@@ -257,22 +260,40 @@ struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
 		return result;
 	}
 
+	static void validateAppTypeOrAppStartCommandSet(const ConfigKit::Store &config,
+		vector<ConfigKit::Error> &errors)
+	{
+		typedef ConfigKit::Error Error;
+
+		if (config["app_type"].isNull() && config["app_start_command"].isNull()) {
+			errors.push_back(Error(
+				"Either '{{app_type}}' or '{{app_start_command}}' must be set"));
+		}
+		if (!config["app_type"].isNull() && config["startup_file"].isNull()) {
+			errors.push_back(Error(
+				"If '{{app_type}}' is set, then '{{startup_file}}' must also be set"));
+		}
+	}
+
 	static void validateAppType(const string &appTypeKey,
+		const WrapperRegistry::Registry *wrapperRegistry,
 		const ConfigKit::Store &config, vector<ConfigKit::Error> &errors)
 	{
 		typedef ConfigKit::Error Error;
 
-		if (!config[appTypeKey].isNull()) {
-			PassengerAppType appType = getAppType(config[appTypeKey].asString());
-			if (appType == PAT_NONE || appType == PAT_ERROR) {
+		if (!config[appTypeKey].isNull() && wrapperRegistry != NULL) {
+			const WrapperRegistry::Entry &entry =
+				wrapperRegistry->lookup(config[appTypeKey].asString());
+			if (entry.isNull()) {
 				string message = "'{{" + appTypeKey + "}}' is set to '"
 					+ config[appTypeKey].asString() + "', which is not a"
 					" valid application type. Supported app types are:";
-				const AppTypeDefinition *definition = &appTypeDefinitions[0];
-				while (definition->type != PAT_NONE) {
+				WrapperRegistry::Registry::ConstIterator it(
+					wrapperRegistry->getIterator());
+				while (*it != NULL) {
 					message.append(1, ' ');
-					message.append(definition->name);
-					definition++;
+					message.append(it.getValue().language);
+					it.next();
 				}
 				errors.push_back(Error(message));
 			}
@@ -287,7 +308,10 @@ struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
 
 	static Json::Value normalizeStartupFile(const Json::Value &effectiveValues) {
 		Json::Value updates;
-		updates["startup_file"] = absolutizePath(effectiveValues["startup_file"].asString());
+		if (effectiveValues.isMember("startup_file")) {
+			updates["startup_file"] = absolutizePath(
+				effectiveValues["startup_file"].asString());
+		}
 		return updates;
 	}
 };