passenger 5.0.10 → 5.0.11

data/ext/common/{agents/LoggingAgent → agent/UstRouter}/OptionParser.h

@@ -22,8 +22,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_LOGGING_AGENT_OPTION_PARSER_H_
-#define _PASSENGER_LOGGING_AGENT_OPTION_PARSER_H_
+#ifndef _PASSENGER_UST_ROUTER_OPTION_PARSER_H_
+#define _PASSENGER_UST_ROUTER_OPTION_PARSER_H_
 
 #include <cstdio>
 #include <cstdlib>
@@ -39,25 +39,25 @@ using namespace std;
 
 
 inline void
-loggingAgentUsage() {
-	printf("Usage: " AGENT_EXE " logger <OPTIONS...>\n");
-	printf("Runs the " PROGRAM_NAME " logging agent.\n");
+ustRouterUsage() {
+	printf("Usage: " AGENT_EXE " ust-router <OPTIONS...>\n");
+	printf("Runs the " PROGRAM_NAME " UstRouter.\n");
 	printf("\n");
 	printf("Required options:\n");
 	printf("      --passenger-root PATH   The location to the " PROGRAM_NAME " source\n");
 	printf("                              directory\n");
-	printf("      --password-file PATH    Protect the logging server with the password in\n");
+	printf("      --password-file PATH    Protect the UstRouter controller with the password in\n");
 	printf("                              this file\n");
 	printf("\n");
 	printf("Other options (optional):\n");
 	printf("  -l, --listen ADDRESS        Listen on the given address. The address must be\n");
 	printf("                              formatted as tcp://IP:PORT for TCP sockets, or\n");
 	printf("                              unix:PATH for Unix domain sockets.\n");
-	printf("                              " DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS "\n");
+	printf("                              " DEFAULT_UST_ROUTER_LISTEN_ADDRESS "\n");
 	printf("\n");
 	printf("      --api-listen ADDRESS    Listen on the given address for API commands.\n");
 	printf("                              The address must be in the same format as that\n");
-	printf("                              of --listen. Default: " DEFAULT_LOGGING_AGENT_API_LISTEN_ADDRESS "\n");
+	printf("                              of --listen. Default: " DEFAULT_UST_ROUTER_API_LISTEN_ADDRESS "\n");
 	printf("      --authorize [LEVEL]:USERNAME:PASSWORDFILE\n");
 	printf("                              Enables authentication on the API server,\n");
 	printf("                              through the given API account. LEVEL indicates\n");
@@ -84,18 +84,18 @@ loggingAgentUsage() {
 }
 
 inline bool
-parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &options) {
-	OptionParser p(loggingAgentUsage);
+parseUstRouterOption(int argc, const char *argv[], int &i, VariantMap &options) {
+	OptionParser p(ustRouterUsage);
 
 	if (p.isValueFlag(argc, i, argv[i], '\0', "--passenger-root")) {
 		options.set("passenger_root", argv[i + 1]);
 		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--password-file")) {
-		options.set("logging_agent_password_file", argv[i + 1]);
+		options.set("ust_router_password_file", argv[i + 1]);
 		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], 'l', "--listen")) {
 		if (getSocketAddressType(argv[i + 1]) != SAT_UNKNOWN) {
-			options.set("logging_agent_address", argv[i + 1]);
+			options.set("ust_router_address", argv[i + 1]);
 			i += 2;
 		} else {
 			fprintf(stderr, "ERROR: invalid address format for --listen. The address "
@@ -105,7 +105,7 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 		}
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--api-listen")) {
 		if (getSocketAddressType(argv[i + 1]) != SAT_UNKNOWN) {
-			vector<string> addresses = options.getStrSet("logging_agent_api_addresses",
+			vector<string> addresses = options.getStrSet("ust_router_api_addresses",
 				false);
 			if (addresses.size() == SERVER_KIT_MAX_SERVER_ENDPOINTS) {
 				fprintf(stderr, "ERROR: you may specify up to %u --api-listen addresses.\n",
@@ -113,7 +113,7 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 				exit(1);
 			}
 			addresses.push_back(argv[i + 1]);
-			options.setStrSet("logging_agent_api_addresses", addresses);
+			options.setStrSet("ust_router_api_addresses", addresses);
 			i += 2;
 		} else {
 			fprintf(stderr, "ERROR: invalid address format for --api-listen. The address "
@@ -123,7 +123,7 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 		}
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--authorize")) {
 		vector<string> args;
-		vector<string> authorizations = options.getStrSet("logging_agent_authorizations",
+		vector<string> authorizations = options.getStrSet("ust_router_authorizations",
 				false);
 
 		split(argv[i + 1], ':', args);
@@ -134,10 +134,10 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 		}
 
 		authorizations.push_back(argv[i + 1]);
-		options.setStrSet("logging_agent_authorizations", authorizations);
+		options.setStrSet("ust_router_authorizations", authorizations);
 		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--dump-file")) {
-		options.set("analytics_dump_file", argv[i + 1]);
+		options.set("ust_router_dump_file", argv[i + 1]);
 		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--user")) {
 		options.set("analytics_log_user", argv[i + 1]);
@@ -148,12 +148,12 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-level")) {
 		// We do not set log_level because, when this function is called from
 		// the Watchdog, we don't want to affect the Watchdog's own log level.
-		options.setInt("logging_agent_log_level", atoi(argv[i + 1]));
+		options.setInt("ust_router_log_level", atoi(argv[i + 1]));
 		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-file")) {
 		// We do not set debug_log_file because, when this function is called from
 		// the Watchdog, we don't want to affect the Watchdog's own log file.
-		options.set("logging_agent_log_file", argv[i + 1]);
+		options.set("ust_router_log_file", argv[i + 1]);
 		i += 2;
 	} else {
 		return false;
@@ -164,4 +164,4 @@ parseLoggingAgentOption(int argc, const char *argv[], int &i, VariantMap &option
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_LOGGING_AGENT_OPTION_PARSER_H_ */
+#endif /* _PASSENGER_UST_ROUTER_OPTION_PARSER_H_ */

data/ext/common/{agents → agent}/Watchdog/ApiServer.h

@@ -29,7 +29,7 @@
 #include <string>
 #include <cstring>
 
-#include <agents/ApiServerUtils.h>
+#include <agent/ApiServerUtils.h>
 #include <ServerKit/HttpServer.h>
 #include <DataStructures/LString.h>
 #include <Exceptions.h>

data/ext/common/{agents/Watchdog/HelperAgentWatcher.cpp → agent/Watchdog/CoreWatcher.cpp}

@@ -1,6 +1,6 @@
 /*
  *  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.
  *
@@ -23,12 +23,12 @@
  *  THE SOFTWARE.
  */
 
-class HelperAgentWatcher: public AgentWatcher {
+class CoreWatcher: public AgentWatcher {
 protected:
 	string agentFilename;
 
 	virtual const char *name() const {
-		return PROGRAM_NAME " helper agent";
+		return SHORT_PROGRAM_NAME " core";
 	}
 
 	virtual string getExeFilename() const {
@@ -36,13 +36,13 @@ protected:
 	}
 
 	virtual void execProgram() const {
-		if (hasEnvOption("PASSENGER_RUN_HELPER_AGENT_IN_VALGRIND", false)) {
+		if (hasEnvOption("PASSENGER_RUN_CORE_IN_VALGRIND", false)) {
 			execlp("valgrind", "valgrind", "--dsymutil=yes", "--track-origins=yes", "--leak-check=full",
-				agentFilename.c_str(), "server",
+				agentFilename.c_str(), "core",
 				// Some extra space to allow the child process to change its process title.
 				"                                                ", (char *) 0);
 		} else {
-			execl(agentFilename.c_str(), AGENT_EXE, "server",
+			execl(agentFilename.c_str(), AGENT_EXE, "core",
 				// Some extra space to allow the child process to change its process title.
 				"                                                ", (char *) 0);
 		}
@@ -50,7 +50,7 @@ protected:
 
 	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
 		VariantMap options = *agentsOptions;
-		options.erase("logging_agent_authorizations");
+		options.erase("ust_router_authorizations");
 		options.writeToFd(fd);
 	}
 
@@ -59,7 +59,7 @@ protected:
 	}
 
 public:
-	HelperAgentWatcher(const WorkingObjectsPtr &wo)
+	CoreWatcher(const WorkingObjectsPtr &wo)
 		: AgentWatcher(wo)
 	{
 		agentFilename = wo->resourceLocator->findSupportBinary(AGENT_EXE);
@@ -67,8 +67,12 @@ public:
 
 	virtual void reportAgentsInformation(VariantMap &report) {
 		const VariantMap &options = *agentsOptions;
-		vector<string> addresses = options.getStrSet("server_addresses");
+		vector<string> addresses = options.getStrSet("core_addresses");
+		report.set("core_address", addresses.front());
+		report.set("core_password", options.get("core_password"));
+
+		// For backwards compatibility:
 		report.set("server_address", addresses.front());
-		report.set("server_password", options.get("server_password"));
+		report.set("server_password", options.get("core_password"));
 	}
 };

data/ext/common/{agents → agent}/Watchdog/Main.cpp

@@ -57,11 +57,11 @@
 #include <cstring>
 #include <cerrno>
 
-#include <agents/Base.h>
-#include <agents/ApiServerUtils.h>
-#include <agents/HelperAgent/OptionParser.h>
-#include <agents/LoggingAgent/OptionParser.h>
-#include <agents/Watchdog/ApiServer.h>
+#include <agent/Base.h>
+#include <agent/ApiServerUtils.h>
+#include <agent/Core/OptionParser.h>
+#include <agent/UstRouter/OptionParser.h>
+#include <agent/Watchdog/ApiServer.h>
 #include <Constants.h>
 #include <InstanceDirectory.h>
 #include <FileDescriptor.h>
@@ -154,8 +154,8 @@ static void cleanup(const WorkingObjectsPtr &wo);
 
 #include "AgentWatcher.cpp"
 #include "InstanceDirToucher.cpp"
-#include "HelperAgentWatcher.cpp"
-#include "LoggingAgentWatcher.cpp"
+#include "CoreWatcher.cpp"
+#include "UstRouterWatcher.cpp"
 
 
 /***** Functions *****/
@@ -529,22 +529,22 @@ usage() {
 	printf("Usage: " AGENT_EXE " watchdog <OPTIONS...>\n");
 	printf("Runs the " PROGRAM_NAME " watchdog.\n\n");
 	printf("The watchdog runs and supervises various " PROGRAM_NAME " agent processes,\n");
-	printf("namely the HTTP server and logging server. Arguments marked with \"[A]\", e.g.\n");
+	printf("namely the core and the UstRouter. Arguments marked with \"[A]\", e.g.\n");
 	printf("--passenger-root and --log-level, are automatically passed to all supervised\n");
 	printf("agents, unless you explicitly override them by passing extra arguments to a\n");
 	printf("supervised agent specifically. You can pass arguments to a supervised agent by\n");
-	printf("wrapping those arguments between --BS/--ES and --BL/--EL.\n");
+	printf("wrapping those arguments between --BC/--EC and --BU/--EU.\n");
 	printf("\n");
-	printf("  Example 1: pass some arguments to the HTTP server.\n\n");
-	printf("  " AGENT_EXE " watchdog --passenger-root /opt/passenger \\\n");
-	printf("    --BS --listen tcp://127.0.0.1:4000 /webapps/foo\n");
+	printf("  Example 1: pass some arguments to the core.\n\n");
+	printf("  " SHORT_PROGRAM_NAME " watchdog --passenger-root /opt/passenger \\\n");
+	printf("    --BC --listen tcp://127.0.0.1:4000 /webapps/foo\n");
 	printf("\n");
-	printf("  Example 2: pass some arguments to the HTTP server, and some others to the\n");
-	printf("  logging server. The watchdog itself and the HTTP server will use logging\n");
-	printf("  level 3, while the logging server will use logging level 1.\n\n");
-	printf("  " AGENT_EXE " watchdog --passenger-root /opt/passenger \\\n");
-	printf("    --BS --listen tcp://127.0.0.1:4000 /webapps/foo --ES \\\n");
-	printf("    --BL --log-level 1 --EL \\\n");
+	printf("  Example 2: pass some arguments to the core, and some others to the\n");
+	printf("  UstRouter. The watchdog itself and the core will use logging\n");
+	printf("  level 3, while the UstRouter will use logging level 1.\n\n");
+	printf("  " SHORT_PROGRAM_NAME " watchdog --passenger-root /opt/passenger \\\n");
+	printf("    --BC --listen tcp://127.0.0.1:4000 /webapps/foo --EC \\\n");
+	printf("    --BU --log-level 1 --EU \\\n");
 	printf("    --log-level 3\n");
 	printf("\n");
 	printf("Required options:\n");
@@ -552,14 +552,16 @@ usage() {
 	printf("                              directory [A]\n");
 	printf("\n");
 	printf("Argument passing options (optional):\n");
-	printf("  --BS, --begin-server-args   Signals the beginning of arguments to pass to the\n");
-	printf("                              HTTP server\n");
-	printf("  --ES, --end-server-args     Signals the end of arguments to pass to the HTTP\n");
-	printf("                              server\n");
-	printf("  --BL, --begin-logger-args   Signals the beginning of arguments to pass to the\n");
-	printf("                              logging server\n");
-	printf("  --EL, --end-logger-args     Signals the end of arguments to pass to the\n");
-	printf("                              logging server\n");
+	printf("  --BC, --begin-core-args   Signals the beginning of arguments to pass to the\n");
+	printf("                            Passenger core\n");
+	printf("  --EC, --end-core-args     Signals the end of arguments to pass to the\n");
+	printf("                            Passenger core\n");
+	printf("  --BU, --begin-ust-router-args\n");
+	printf("                            Signals the beginning of arguments to pass to the\n");
+	printf("                            UstRouter\n");
+	printf("  --EU, --end-ust-router-args\n");
+	printf("                              Signals the end of arguments to pass to the\n");
+	printf("                            UstRouter\n");
 	printf("\n");
 	printf("Other options (optional):\n");
 	printf("      --api-listen ADDRESS  Listen on the given address for API commands.\n");
@@ -616,43 +618,43 @@ parseOptions(int argc, const char *argv[], VariantMap &options) {
 		if (p.isValueFlag(argc, i, argv[i], '\0', "--passenger-root")) {
 			options.set("passenger_root", argv[i + 1]);
 			i += 2;
-		} else if (p.isFlag(argv[i], '\0', "--BS")
-			|| p.isFlag(argv[i], '\0', "--begin-server-args"))
+		} else if (p.isFlag(argv[i], '\0', "--BC")
+			|| p.isFlag(argv[i], '\0', "--begin-core-args"))
 		{
 			i++;
 			while (i < argc) {
-				if (p.isFlag(argv[i], '\0', "--ES")
-				 || p.isFlag(argv[i], '\0', "--end-server-args"))
+				if (p.isFlag(argv[i], '\0', "--EC")
+				 || p.isFlag(argv[i], '\0', "--end-core-args"))
 				{
 					i++;
 					break;
-				} else if (p.isFlag(argv[i], '\0', "--BL")
-				 || p.isFlag(argv[i], '\0', "--begin-logger-args"))
+				} else if (p.isFlag(argv[i], '\0', "--BU")
+				 || p.isFlag(argv[i], '\0', "--begin-ust-router-args"))
 				{
 					break;
-				} else if (!parseServerOption(argc, argv, i, options)) {
-					fprintf(stderr, "ERROR: unrecognized HTTP server argument %s. Please "
-						"type '%s server --help' for usage.\n", argv[i], argv[0]);
+				} else if (!parseCoreOption(argc, argv, i, options)) {
+					fprintf(stderr, "ERROR: unrecognized core argument %s. Please "
+						"type '%s core --help' for usage.\n", argv[i], argv[0]);
 					exit(1);
 				}
 			}
-		} else if (p.isFlag(argv[i], '\0', "--BL")
-			|| p.isFlag(argv[i], '\0', "--begin-logger-args"))
+		} else if (p.isFlag(argv[i], '\0', "--BU")
+			|| p.isFlag(argv[i], '\0', "--begin-ust-router-args"))
 		{
 			i++;
 			while (i < argc) {
-				if (p.isFlag(argv[i], '\0', "--EL")
-				 || p.isFlag(argv[i], '\0', "--end-logger-args"))
+				if (p.isFlag(argv[i], '\0', "--EU")
+				 || p.isFlag(argv[i], '\0', "--end-ust-router-args"))
 				{
 					i++;
 					break;
-				} else if (p.isFlag(argv[i], '\0', "--BS")
-				 || p.isFlag(argv[i], '\0', "--begin-server-args"))
+				} else if (p.isFlag(argv[i], '\0', "--BC")
+				 || p.isFlag(argv[i], '\0', "--begin-core-args"))
 				{
 					break;
-				} else if (!parseLoggingAgentOption(argc, argv, i, options)) {
-					fprintf(stderr, "ERROR: unrecognized logging agent argument %s. Please "
-						"type '%s logger --help' for usage.\n", argv[i], argv[0]);
+				} else if (!parseUstRouterOption(argc, argv, i, options)) {
+					fprintf(stderr, "ERROR: unrecognized UstRouter argument %s. Please "
+						"type '%s ust-router --help' for usage.\n", argv[i], argv[0]);
 					exit(1);
 				}
 			}
@@ -776,7 +778,7 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	oldOomScore = setOomScoreNeverKill();
 
 	agentsOptions = new VariantMap();
-	*agentsOptions = initializeAgent(argc, &argv, AGENT_EXE " watchdog",
+	*agentsOptions = initializeAgent(argc, &argv, SHORT_PROGRAM_NAME " watchdog",
 		parseOptions, NULL, 2);
 
 	// Start all sub-agents with this environment variable.
@@ -912,19 +914,19 @@ lowerPrivilege() {
 
 		if (initgroups(userName.c_str(), gid) != 0) {
 			int e = errno;
-			throw SystemException("Unable to lower " AGENT_EXE " watchdog's privilege "
+			throw SystemException("Unable to lower " SHORT_PROGRAM_NAME " watchdog's privilege "
 				"to that of user '" + userName + "' and group '" + groupName +
 				"': cannot set supplementary groups", e);
 		}
 		if (setgid(gid) != 0) {
 			int e = errno;
-			throw SystemException("Unable to lower " AGENT_EXE " watchdog's privilege "
+			throw SystemException("Unable to lower " SHORT_PROGRAM_NAME " watchdog's privilege "
 				"to that of user '" + userName + "' and group '" + groupName +
 				"': cannot set group ID to " + toString(gid), e);
 		}
 		if (setuid(pwUser->pw_uid) != 0) {
 			int e = errno;
-			throw SystemException("Unable to lower " AGENT_EXE " watchdog's privilege "
+			throw SystemException("Unable to lower " SHORT_PROGRAM_NAME " watchdog's privilege "
 				"to that of user '" + userName + "' and group '" + groupName +
 				"': cannot set user ID to " + toString(pwUser->pw_uid), e);
 		}
@@ -987,6 +989,16 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 	instanceOptions.defaultGid = wo->defaultGid;
 	instanceOptions.properties["name"] = wo->randomGenerator.generateAsciiString(8);
 	instanceOptions.properties["server_software"] = options.get("server_software");
+	if (options.has("web_server_config_files")) {
+		vector<string> configFiles = options.getStrSet("web_server_config_files");
+		Json::Value array(Json::arrayValue);
+
+		foreach (string configFile, configFiles) {
+			array.append(configFile);
+		}
+
+		instanceOptions.properties["web_server_config_files"] = array;
+	}
 	wo->instanceDir = boost::make_shared<InstanceDirectory>(instanceOptions,
 		options.get("instance_registry_dir"));
 	options.set("instance_dir", wo->instanceDir->getPath());
@@ -1018,57 +1030,57 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 		createFile(wo->instanceDir->getPath() + "/full_admin_password.txt",
 			fullAdminPassword, S_IRUSR | S_IWUSR);
 	}
-	options.setDefault("server_pid_file", wo->instanceDir->getPath() + "/server.pid");
+	options.setDefault("core_pid_file", wo->instanceDir->getPath() + "/core.pid");
 	options.set("watchdog_fd_passing_password", wo->randomGenerator.generateAsciiString(24));
 
 	UPDATE_TRACE_POINT();
-	strset = options.getStrSet("server_addresses", false);
+	strset = options.getStrSet("core_addresses", false);
 	strset.insert(strset.begin(),
-		"unix:" + wo->instanceDir->getPath() + "/agents.s/server");
-	options.setStrSet("server_addresses", strset);
-	options.setDefault("server_password",
+		"unix:" + wo->instanceDir->getPath() + "/agents.s/core");
+	options.setStrSet("core_addresses", strset);
+	options.setDefault("core_password",
 		wo->randomGenerator.generateAsciiString(24));
 
-	strset = options.getStrSet("server_api_addresses", false);
+	strset = options.getStrSet("core_api_addresses", false);
 	strset.insert(strset.begin(),
-		"unix:" + wo->instanceDir->getPath() + "/agents.s/server_api");
-	options.setStrSet("server_api_addresses", strset);
+		"unix:" + wo->instanceDir->getPath() + "/agents.s/core_api");
+	options.setStrSet("core_api_addresses", strset);
 
 	UPDATE_TRACE_POINT();
-	options.setDefault("logging_agent_address",
-		"unix:" + wo->instanceDir->getPath() + "/agents.s/logging");
-	options.setDefault("logging_agent_password",
+	options.setDefault("ust_router_address",
+		"unix:" + wo->instanceDir->getPath() + "/agents.s/ust_router");
+	options.setDefault("ust_router_password",
 		wo->randomGenerator.generateAsciiString(24));
-	strset = options.getStrSet("logging_agent_api_addresses", false);
+	strset = options.getStrSet("ust_router_api_addresses", false);
 	strset.insert(strset.begin(),
-		"unix:" + wo->instanceDir->getPath() + "/agents.s/logging_api");
-	options.setStrSet("logging_agent_api_addresses", strset);
+		"unix:" + wo->instanceDir->getPath() + "/agents.s/ust_router_api");
+	options.setStrSet("ust_router_api_addresses", strset);
 
 	UPDATE_TRACE_POINT();
-	strset = options.getStrSet("logging_agent_authorizations", false);
+	strset = options.getStrSet("ust_router_authorizations", false);
 	strset.insert(strset.begin(),
 		"readonly:ro_admin:" + wo->instanceDir->getPath() +
 		"/read_only_admin_password.txt");
 	strset.insert(strset.begin(),
 		"full:admin:" + wo->instanceDir->getPath() +
 		"/full_admin_password.txt");
-	options.setStrSet("logging_agent_authorizations", strset);
+	options.setStrSet("ust_router_authorizations", strset);
 
-	strset = options.getStrSet("server_authorizations", false);
+	strset = options.getStrSet("core_authorizations", false);
 	strset.insert(strset.begin(),
 		"readonly:ro_admin:" + wo->instanceDir->getPath() +
 		"/read_only_admin_password.txt");
 	strset.insert(strset.begin(),
 		"full:admin:" + wo->instanceDir->getPath() +
 		"/full_admin_password.txt");
-	options.setStrSet("server_authorizations", strset);
+	options.setStrSet("core_authorizations", strset);
 }
 
 static void
 initializeAgentWatchers(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 	TRACE_POINT();
-	watchers.push_back(boost::make_shared<HelperAgentWatcher>(wo));
-	watchers.push_back(boost::make_shared<LoggingAgentWatcher>(wo));
+	watchers.push_back(boost::make_shared<CoreWatcher>(wo));
+	watchers.push_back(boost::make_shared<UstRouterWatcher>(wo));
 }
 
 static void
@@ -1139,13 +1151,11 @@ initializeApiServer(const WorkingObjectsPtr &wo) {
 
 static void
 createCompatSymlinks(const WorkingObjectsPtr &wo) {
-	/* In 5.0.10, 'watchdog' has been renamed to 'watchdog_api',
-	 * 'server_admin' has been renamed to 'server_api',
-	 * and 'logging_admin' has been renamed to 'logging_api'.
-	 * To maintain backward compatibility with older versions of
+	/* To maintain backward compatibility with older versions of
 	 * passenger-status etc, we create compatibility symlinks.
 	 */
 	int ret, e;
+	string instanceDir = wo->instanceDir->getPath() + "/";
 	string prefix = wo->instanceDir->getPath() + "/agents.s/";
 
 	do {
@@ -1158,7 +1168,16 @@ createCompatSymlinks(const WorkingObjectsPtr &wo) {
 	}
 
 	do {
-		ret = symlink("server_api", (prefix + "server_admin").c_str());
+		ret = symlink("core", (prefix + "server").c_str());
+	} while (ret == -1 && errno == EAGAIN);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot create symlink: " + prefix + "server",
+			e, prefix + "server");
+	}
+
+	do {
+		ret = symlink("core_api", (prefix + "server_admin").c_str());
 	} while (ret == -1 && errno == EAGAIN);
 	if (ret == -1) {
 		e = errno;
@@ -1167,13 +1186,50 @@ createCompatSymlinks(const WorkingObjectsPtr &wo) {
 	}
 
 	do {
-		ret = symlink("logging_api", (prefix + "logging_admin").c_str());
+		ret = symlink("core_api", (prefix + "server_api").c_str());
+	} while (ret == -1 && errno == EAGAIN);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot create symlink: " + prefix + "server_api",
+			e, prefix + "server_api");
+	}
+
+	do {
+		ret = symlink("ust_router", (prefix + "logging").c_str());
+	} while (ret == -1 && errno == EAGAIN);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot create symlink: " + prefix + "logging",
+			e, prefix + "logging");
+	}
+
+	do {
+		ret = symlink("ust_router_api", (prefix + "logging_admin").c_str());
 	} while (ret == -1 && errno == EAGAIN);
 	if (ret == -1) {
 		e = errno;
 		throw FileSystemException("Cannot create symlink: " + prefix + "logging_admin",
 			e, prefix + "logging_admin");
 	}
+
+	do {
+		ret = symlink("ust_router_api", (prefix + "logging_api").c_str());
+	} while (ret == -1 && errno == EAGAIN);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot create symlink: " + prefix + "logging_api",
+			e, prefix + "logging_api");
+	}
+
+
+	do {
+		ret = symlink("core.pid", (instanceDir + "server.pid").c_str());
+	} while (ret == -1 && errno == EAGAIN);
+	if (ret == -1) {
+		e = errno;
+		throw FileSystemException("Cannot create symlink: " + instanceDir + "logging_api",
+			e, instanceDir + "server.pid");
+	}
 }
 
 static void
@@ -1290,7 +1346,7 @@ watchdogMain(int argc, char *argv[]) {
 	initializeBareEssentials(argc, argv, wo);
 	setAgentsOptionsDefaults();
 	sanityCheckOptions();
-	P_NOTICE("Starting " AGENT_EXE " watchdog...");
+	P_NOTICE("Starting " SHORT_PROGRAM_NAME " watchdog...");
 	P_DEBUG("Watchdog options: " << agentsOptions->inspect());
 	InstanceDirToucherPtr instanceDirToucher;
 	vector<AgentWatcherPtr> watchers;