passenger 5.0.21 → 5.0.22

data/src/agent/Core/OptionParser.h

@@ -132,11 +132,20 @@ coreUsage() {
 	printf("                            Maximum time that preloader processes may be\n");
 	printf("                            be idle. A value of 0 means that preloader\n");
 	printf("                            processes never timeout. Default: %d\n", DEFAULT_MAX_PRELOADER_IDLE_TIME);
+	printf("      --force-max-concurrent-requests-per-process NUMBER\n");
+	printf("                            Force " SHORT_PROGRAM_NAME " to believe that an application\n");
+	printf("                            process can handle the given number of concurrent\n");
+	printf("                            requests per process\n");
 	printf("      --min-instances N     Minimum number of application processes. Default: 1\n");
+	printf("      --memory-limit MB     Restart application processes that go over the\n");
+    printf("                            given memory limit (Enterprise only)\n");
 	printf("\n");
 	printf("Request handling options (optional):\n");
 	printf("      --max-request-time    Abort requests that take too much time (Enterprise\n");
 	printf("                            only)\n");
+	printf("      --max-request-queue-size NUMBER\n");
+	printf("                            Specify request queue size. Default: %d\n",
+		DEFAULT_MAX_REQUEST_QUEUE_SIZE);
 	printf("      --sticky-sessions     Enable sticky sessions\n");
 	printf("      --sticky-sessions-cookie-name NAME\n");
 	printf("                            Cookie name to use for sticky sessions.\n");
@@ -145,6 +154,9 @@ coreUsage() {
 	printf("                            Vary the turbocache by the cookie of the given name\n");
 	printf("      --disable-turbocaching\n");
 	printf("                            Disable turbocaching\n");
+	printf("      --no-abort-websockets-on-process-shutdown\n");
+	printf("                            Do not abort WebSocket connections on process\n");
+	printf("                            shutdown or restart\n");
 	printf("\n");
 	printf("Other options (optional):\n");
 	printf("      --log-file PATH       Log to the given file.\n");
@@ -256,9 +268,15 @@ parseCoreOption(int argc, const char *argv[], int &i, VariantMap &options) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--max-preloader-idle-time")) {
 		options.setInt("max_preloader_idle_time", atoi(argv[i + 1]));
 		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--force-max-concurrent-requests-per-process")) {
+		options.setInt("force_max_concurrent_requests_per_process", atoi(argv[i + 1]));
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--min-instances")) {
 		options.setInt("min_instances", atoi(argv[i + 1]));
 		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--memory-limit")) {
+		options.setInt("memory_limit", atoi(argv[i + 1]));
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], 'e', "--environment")) {
 		options.set("environment", argv[i + 1]);
 		i += 2;
@@ -292,6 +310,9 @@ parseCoreOption(int argc, const char *argv[], int &i, VariantMap &options) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--max-request-time")) {
 		options.setInt("max_request_time", atoi(argv[i + 1]));
 		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--max-request-queue-size")) {
+		options.setInt("max_request_queue_size", atoi(argv[i + 1]));
+		i += 2;
 	} else if (p.isFlag(argv[i], '\0', "--sticky-sessions")) {
 		options.setBool("sticky_sessions", true);
 		i++;
@@ -304,6 +325,9 @@ parseCoreOption(int argc, const char *argv[], int &i, VariantMap &options) {
 	} else if (p.isFlag(argv[i], '\0', "--disable-turbocaching")) {
 		options.setBool("turbocaching", false);
 		i++;
+	} else if (p.isFlag(argv[i], '\0', "--no-abort-websockets-on-process-shutdown")) {
+		options.setBool("abort_websockets_on_process_shutdown", false);
+		i++;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ruby")) {
 		options.set("default_ruby", argv[i + 1]);
 		i += 2;

data/src/agent/Core/ResponseCache.h

@@ -485,19 +485,19 @@ public:
 	 *
 	 * @post result == !req->cacheKey.empty()
 	 */
-	template<typename RequestHandler>
-	bool prepareRequest(RequestHandler *requestHandler, Request *req) {
+	template<typename Controller>
+	bool prepareRequest(Controller *controller, Request *req) {
 		if (req->upgraded() || req->host == NULL) {
 			return false;
 		}
 
 		LString *varyCookieName = req->secureHeaders.lookup(PASSENGER_VARY_TURBOCACHE_BY_COOKIE);
-		if (varyCookieName == NULL && !requestHandler->defaultVaryTurbocacheByCookie.empty()) {
+		if (varyCookieName == NULL && !controller->defaultVaryTurbocacheByCookie.empty()) {
 			varyCookieName = (LString *) psg_palloc(req->pool, sizeof(LString));
 			psg_lstr_init(varyCookieName);
 			psg_lstr_append(varyCookieName, req->pool,
-				requestHandler->defaultVaryTurbocacheByCookie.data(),
-				requestHandler->defaultVaryTurbocacheByCookie.size());
+				controller->defaultVaryTurbocacheByCookie.data(),
+				controller->defaultVaryTurbocacheByCookie.size());
 		}
 		if (varyCookieName != NULL) {
 			LString *cookieHeader = req->headers.lookup(COOKIE);

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

@@ -35,7 +35,7 @@
 #include <RandomGenerator.h>
 #include <Exceptions.h>
 #include <Utils/VariantMap.h>
-#include <Core/UnionStation/Core.h>
+#include <Core/UnionStation/Context.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -63,7 +63,7 @@ struct Config {
 	ErrorHandler errorHandler;
 
 	// Used for Union Station logging.
-	UnionStation::CorePtr unionStationCore;
+	UnionStation::ContextPtr unionStationContext;
 
 	// Used by SmartSpawner and DirectSpawner.
 	RandomGeneratorPtr randomGenerator;

data/src/agent/Core/SpawningKit/SmartSpawner.h

@@ -520,7 +520,7 @@ private:
 
 		try {
 			string message = details.io.readAll(&details.timeout);
-			SpawnException e("An error occured while starting up the preloader.",
+			SpawnException e("An error occurred while starting up the preloader.",
 				message,
 				attributes["html"] == "true",
 				SpawnException::PRELOADER_STARTUP_EXPLAINABLE_ERROR);

data/src/agent/Core/UnionStation/{Core.h → Context.h}

@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_UNION_STATION_CORE_H_
-#define _PASSENGER_UNION_STATION_CORE_H_
+#ifndef _PASSENGER_UNION_STATION_CONTEXT_H_
+#define _PASSENGER_UNION_STATION_CONTEXT_H_
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -53,7 +53,7 @@ using namespace std;
 using namespace boost;
 
 
-class Core: public boost::enable_shared_from_this<Core> {
+class Context: public boost::enable_shared_from_this<Context> {
 private:
 	static const unsigned int CONNECTION_POOL_MAX_SIZE = 10;
 
@@ -80,14 +80,6 @@ private:
 	 */
 	unsigned long long nextReconnectTime;
 
-	static string determineNodeName(const string &givenNodeName) {
-		if (givenNodeName.empty()) {
-			return getHostName();
-		} else {
-			return givenNodeName;
-		}
-	}
-
 	static bool isNetworkError(int code) {
 		return code == EPIPE || code == ECONNREFUSED || code == ECONNRESET
 			|| code == EHOSTUNREACH || code == ENETDOWN || code == ENETUNREACH
@@ -154,7 +146,11 @@ private:
 
 		// Initialize session.
 		UPDATE_TRACE_POINT();
-		writeArrayMessage(fd, &timeout, "init", nodeName.c_str(), NULL);
+		if (nodeName.empty()) {
+			writeArrayMessage(fd, &timeout, "init", NULL);
+		} else {
+			writeArrayMessage(fd, &timeout, "init", nodeName.c_str(), NULL);
+		}
 		if (!readArrayMessage(fd, args, &timeout)) {
 			throw SystemException("Cannot connect to the UstRouter", ECONNREFUSED);
 		} else if (args.size() < 2 || args[0] != "status") {
@@ -177,16 +173,16 @@ private:
 	}
 
 public:
-	Core() {
+	Context() {
 		initialize();
 	}
 
-	Core(const string &_serverAddress, const string &_username,
+	Context(const string &_serverAddress, const string &_username,
 	     const string &_password, const string &_nodeName = string())
 		: serverAddress(_serverAddress),
 		  username(_username),
 		  password(_password),
-		  nodeName(determineNodeName(_nodeName))
+		  nodeName(_nodeName)
 	{
 		initialize();
 	}
@@ -529,12 +525,12 @@ public:
 
 
 inline void
-_checkinConnection(const CorePtr &core, const ConnectionPtr &connection) {
-	core->checkinConnection(connection);
+_checkinConnection(const ContextPtr &ctx, const ConnectionPtr &connection) {
+	ctx->checkinConnection(connection);
 }
 
 
 } // namespace UnionStation
 } // namespace Passenger
 
-#endif /* _PASSENGER_UNION_STATION_CORE_H_ */
+#endif /* _PASSENGER_UNION_STATION_CONTEXT_H_ */

data/src/agent/Core/UnionStation/StopwatchLog.h

@@ -32,6 +32,7 @@
 
 #include <string>
 
+#include <uv.h>
 #include <StaticString.h>
 #include <Exceptions.h>
 #include <Utils/StrIntUtils.h>
@@ -92,7 +93,7 @@ public:
 		pos = appendData(pos, end, "BEGIN: ");
 		pos = appendData(pos, end, name);
 		pos = appendData(pos, end, " (");
-		pos = appendData(pos, end, usecToString(SystemTime::getUsec()));
+		pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
 		pos = appendData(pos, end, ",");
 		if (getrusage(RUSAGE_SELF, &usage) == -1) {
 			int e = errno;
@@ -140,7 +141,7 @@ public:
 			}
 			pos = appendData(pos, end, data.name);
 			pos = appendData(pos, end, " (");
-			pos = appendData(pos, end, usecToString(SystemTime::getUsec()));
+			pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
 			pos = appendData(pos, end, ",");
 			if (getrusage(RUSAGE_SELF, &usage) == -1) {
 				int e = errno;

data/src/agent/Core/UnionStation/Transaction.h

@@ -58,10 +58,10 @@ enum ExceptionHandlingMode {
 };
 
 
-class Core;
-typedef boost::shared_ptr<Core> CorePtr;
+class Context;
+typedef boost::shared_ptr<Context> ContextPtr;
 
-inline void _checkinConnection(const CorePtr &core, const ConnectionPtr &connection);
+inline void _checkinConnection(const ContextPtr &ctx, const ConnectionPtr &connection);
 
 
 class Transaction: public boost::noncopyable {
@@ -69,7 +69,7 @@ private:
 	static const int INT64_STR_BUFSIZE = 22; // Long enough for a 64-bit number.
 	static const unsigned long long IO_TIMEOUT = 5000000; // In microseconds.
 
-	const CorePtr core;
+	const ContextPtr context;
 	const ConnectionPtr connection;
 	const string txnId;
 	const string groupName;
@@ -131,14 +131,14 @@ public:
 		: exceptionHandlingMode(PRINT)
 		{ }
 
-	Transaction(const CorePtr &_core,
+	Transaction(const ContextPtr &_context,
 		const ConnectionPtr &_connection,
 		const string &_txnId,
 		const string &_groupName,
 		const string &_category,
 		const string &_unionStationKey,
 		ExceptionHandlingMode _exceptionHandlingMode = PRINT)
-		: core(_core),
+		: context(_context),
 		  connection(_connection),
 		  txnId(_txnId),
 		  groupName(_groupName),
@@ -180,7 +180,7 @@ public:
 				readArrayMessage(connection->fd, &timeout);
 			}
 
-			_checkinConnection(core, connection);
+			_checkinConnection(context, connection);
 			guard.clear();
 		} catch (const SystemException &e) {
 			UPDATE_TRACE_POINT();

data/src/agent/Shared/ApiServerUtils.h

@@ -689,13 +689,17 @@ apiServerProcessPing(Server *server, Client *client, Request *req) {
 
 template<typename Server, typename Client, typename Request>
 inline void
-apiServerProcessVersion(Server *server, Client *client, Request *req) {
+apiServerProcessInfo(Server *server, Client *client, Request *req,
+	const boost::function<void (Json::Value &response)> &postprocessResponse =
+		boost::function<void (Json::Value &)>())
+{
 	Authorization auth(authorize(server, client, req));
 	if (auth.canReadPool || auth.canInspectState) {
 		ServerKit::HeaderTable headers;
 		headers.insert(req->pool, "Content-Type", "application/json");
 
 		Json::Value response;
+		response["pid"] = (Json::UInt64) getpid();
 		response["program_name"] = PROGRAM_NAME;
 		response["program_version"] = PASSENGER_VERSION;
 		response["api_version"] = PASSENGER_API_VERSION;
@@ -705,6 +709,10 @@ apiServerProcessVersion(Server *server, Client *client, Request *req) {
 			response["passenger_enterprise"] = true;
 		#endif
 
+		if (postprocessResponse) {
+			postprocessResponse(response);
+		}
+
 		server->writeSimpleResponse(client, 200, &headers,
 			response.toStyledString());
 		if (!req->ended()) {

data/src/agent/UstRouter/ApiServer.h

@@ -64,8 +64,11 @@ private:
 	void route(Client *client, Request *req, const StaticString &path) {
 		if (path == P_STATIC_STRING("/ping.json")) {
 			apiServerProcessPing(this, client, req);
-		} else if (path == P_STATIC_STRING("/version.json")) {
-			apiServerProcessVersion(this, client, req);
+		} else if (path == P_STATIC_STRING("/info.json")
+			// The "/version.json" path is deprecated
+			|| path == P_STATIC_STRING("/version.json"))
+		{
+			apiServerProcessInfo(this, client, req);
 		} else if (path == P_STATIC_STRING("/shutdown.json")) {
 			apiServerProcessShutdown(this, client, req);
 		} else if (path == P_STATIC_STRING("/backtraces.txt")) {

data/src/agent/UstRouter/Controller.h

@@ -82,6 +82,7 @@ private:
 	string username;
 	string password;
 	string dumpDir;
+	string defaultNodeName;
 	bool devMode;
 
 	RandomGenerator randomGenerator;
@@ -488,8 +489,9 @@ private:
 					"already opened with a different node name (" <<
 					transaction->getNodeName() << " vs " << nodeName << ")");
 				if (ack) {
-					sendErrorToClient(client,
-						"Cannot open transaction: transaction already opened with a different node name");
+					sendErrorToClient(client, "Cannot open transaction: transaction "
+							"already opened with a different node name (" +
+							transaction->getNodeName() + " vs " + nodeName + ")");
 					if (client->connected()) {
 						disconnect(&client);
 					}
@@ -497,10 +499,12 @@ private:
 				goto done;
 			}
 			if (OXT_UNLIKELY(transaction->getCategory() != category)) {
-				SKC_ERROR(client, "Cannot open transaction: transaction already opened with a different category name");
+				SKC_ERROR(client, "Cannot open transaction: transaction already opened with a different category name (" <<
+						transaction->getCategory() << " vs " << category << ")");
 				if (ack) {
 					sendErrorToClient(client,
-						"Cannot open transaction: transaction already opened with a different category name");
+							"Cannot open transaction: transaction already opened with a different category name (" +
+							transaction->getCategory() + " vs " + category + ")");
 					if (client->connected()) {
 						disconnect(&client);
 					}
@@ -597,6 +601,8 @@ private:
 	}
 
 	void processInitMessage(Client *client, const vector<StaticString> &args) {
+		StaticString nodeName;
+
 		if (OXT_UNLIKELY(client->type != Client::UNINITIALIZED)) {
 			logErrorAndSendToClient(client, "Already initialized");
 			if (client->connected()) {
@@ -604,11 +610,16 @@ private:
 			}
 			goto done;
 		}
-		if (OXT_UNLIKELY(!expectingArgumentsCount(client, args, 2))) {
+		if (OXT_UNLIKELY(!expectingMinArgumentsCount(client, args, 1))) {
 			goto done;
 		}
 
-		client->nodeName = args[1];
+		nodeName = getStaticString(args, 1);
+		if (nodeName.empty()) {
+			client->nodeName = defaultNodeName;
+		} else {
+			client->nodeName.assign(nodeName.data(), nodeName.size());
+		}
 		client->type = Client::LOGGER;
 		sendOkToClient(client);
 
@@ -826,7 +837,7 @@ private:
 	}
 
 	static StaticString getStaticString(const vector<StaticString> &args,
-		unsigned int index, const StaticString &defaultValue = "")
+		unsigned int index, const StaticString &defaultValue = StaticString())
 	{
 		if (index < args.size()) {
 			return args[index];
@@ -894,7 +905,8 @@ private:
 		return category == P_STATIC_STRING("requests")
 			|| category == P_STATIC_STRING("processes")
 			|| category == P_STATIC_STRING("exceptions")
-			|| category == P_STATIC_STRING("system_metrics");
+			|| category == P_STATIC_STRING("system_metrics")
+			|| category == P_STATIC_STRING("internal_information");
 	}
 
 	LogSinkPtr openLogFile(Client *client, const StaticString &category) {
@@ -1115,15 +1127,20 @@ public:
 		  username(options.get("ust_router_username", false, "")),
 		  password(options.get("ust_router_password", false, "")),
 		  dumpDir(options.get("ust_router_dump_dir", false, "/tmp")),
+		  defaultNodeName(options.get("ust_router_default_node_name", false, "")),
 		  devMode(options.getBool("ust_router_dev_mode", false, false)),
 		  remoteSender(
 		      options.get("union_station_gateway_address", false, DEFAULT_UNION_STATION_GATEWAY_ADDRESS),
 		      options.getInt("union_station_gateway_port", false, DEFAULT_UNION_STATION_GATEWAY_PORT),
 		      options.get("union_station_gateway_cert", false, ""),
-		      options.get("union_station_proxy_address", false)),
+		      options.get("union_station_proxy_address", false, "")),
 		  gcTimer(getLoop()),
 		  flushTimer(getLoop())
 	{
+		if (defaultNodeName.empty()) {
+			defaultNodeName = getHostName();
+		}
+
 		gcTimer.set<Controller, &Controller::garbageCollect>(this);
 		gcTimer.start(GARBAGE_COLLECTION_TIMEOUT, GARBAGE_COLLECTION_TIMEOUT);
 
@@ -1156,6 +1173,7 @@ public:
 		} else {
 			doc["remote_sender"] = remoteSender.inspectStateAsJson();
 		}
+		doc["default_node_name"] = defaultNodeName;
 		return doc;
 	}
 

data/src/agent/UstRouter/UstRouterMain.cpp

@@ -566,6 +566,7 @@ setAgentsOptionsDefaults() {
 	VariantMap &options = *agentsOptions;
 
 	options.setDefault("ust_router_address", DEFAULT_UST_ROUTER_LISTEN_ADDRESS);
+	options.setDefault("ust_router_default_node_name", getHostName());
 }
 
 static void

data/src/agent/Watchdog/ApiServer.h

@@ -67,8 +67,11 @@ private:
 			processStatusTxt(client, req);
 		} else if (path == P_STATIC_STRING("/ping.json")) {
 			apiServerProcessPing(this, client, req);
-		} else if (path == P_STATIC_STRING("/version.json")) {
-			apiServerProcessVersion(this, client, req);
+		} else if (path == P_STATIC_STRING("/info.json")
+			// The "/version.json" path is deprecated
+			|| path == P_STATIC_STRING("/version.json"))
+		{
+			apiServerProcessInfo(this, client, req);
 		} else if (path == P_STATIC_STRING("/shutdown.json")) {
 			apiServerProcessShutdown(this, client, req);
 		} else if (path == P_STATIC_STRING("/backtraces.txt")) {