passenger 5.0.4 → 5.0.5

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -414,7 +414,7 @@ public:
 				return;
 			}
 
-			StdioGuard guard(f);
+			StdioGuard guard(f, NULL, 0);
 			bool hasPss = false;
 			bool hasPrivateDirty = false;
 			bool hasSwap = false;

data/ext/common/Utils/ScopeGuard.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -30,6 +30,7 @@
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <cstdio>
+#include <Logging.h>
 
 namespace Passenger {
 
@@ -99,12 +100,17 @@ public:
 		: f(0)
 		{ }
 
-	StdioGuard(FILE *_f)
+	StdioGuard(FILE *_f, const char *file, unsigned int line)
 		: f(_f)
-		{ }
+	{
+		if (_f != NULL && file != NULL) {
+			P_LOG_FILE_DESCRIPTOR_OPEN3(fileno(_f), file, line);
+		}
+	}
 
 	~StdioGuard() {
 		if (f != NULL) {
+			P_LOG_FILE_DESCRIPTOR_CLOSE(fileno(f));
 			fclose(f);
 		}
 	}
@@ -116,14 +122,19 @@ private:
 	bool ignoreErrors;
 
 public:
-	FdGuard(int _fd, bool _ignoreErrors = false)
+	FdGuard(int _fd, const char *file, unsigned int line, bool _ignoreErrors = false)
 		: fd(_fd),
 		  ignoreErrors(_ignoreErrors)
-		{ }
+	{
+		if (_fd != -1 && file != NULL) {
+			P_LOG_FILE_DESCRIPTOR_OPEN3(_fd, file, line);
+		}
+	}
 
 	~FdGuard() {
 		if (fd != -1) {
 			safelyClose(fd, ignoreErrors);
+			P_LOG_FILE_DESCRIPTOR_CLOSE(fd);
 		}
 	}
 

data/ext/common/Utils/SpeedMeter.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -59,7 +59,7 @@ namespace Passenger {
  * ### `maxSamples`
  *
  * `maxSamples` dictates the sample buffer size: the maximum number of samples
- * to hold in memory. Defaults to 6.
+ * to hold in memory. Defaults to 8.
  *
  * The more samples you have, the more historical data influences the results.
  * If you have few samples then recent data have the most impact on the results.

data/ext/common/Utils/StrIntUtils.cpp

@@ -111,8 +111,8 @@ splitIncludeSep(const StaticString &str, char sep, vector<StaticString> &output)
 }
 
 void
-truncateBeforeTokens(const char* str, const char *tokens, int maxBetweenTokens, std::stringstream& sstream) {
-	std::string source(str);
+truncateBeforeTokens(const char *str, const StaticString &tokens, int maxBetweenTokens, ostream &sstream) {
+	StaticString source(str);
 
 	if (source.empty()) {
 		return;
@@ -233,10 +233,10 @@ stringToUnsignedNumeric(const StaticString &str) {
 	string::size_type i = 0;
 	const char *data = str.data();
 
-	while (data[i] == ' ' && i < str.size()) {
+	while (i < str.size() && data[i] == ' ') {
 		i++;
 	}
-	while (data[i] >= '0' && data[i] <= '9' && i < str.size()) {
+	while (i < str.size() && data[i] >= '0' && data[i] <= '9') {
 		result *= 10;
 		result += data[i] - '0';
 		i++;
@@ -262,14 +262,14 @@ stringToSignedNumeric(const StaticString &str) {
 	const char *data = str.data();
 	bool minus = false;
 
-	while (data[i] == ' ' && i < str.size()) {
+	while (i < str.size() && data[i] == ' ') {
 		i++;
 	}
 	if (data[i] == '-') {
 		minus = true;
 		i++;
 	}
-	while (data[i] >= '0' && data[i] <= '9' && i < str.size()) {
+	while (i < str.size() && data[i] >= '0' && data[i] <= '9') {
 		result *= 10;
 		result += data[i] - '0';
 		i++;

data/ext/common/Utils/StrIntUtils.h

@@ -27,6 +27,7 @@
 
 #include <string>
 #include <vector>
+#include <ostream>
 #include <sstream>
 #include <stdexcept>
 #include <new>
@@ -134,7 +135,7 @@ void splitIncludeSep(const StaticString & restrict_ref str,
  *
  * Example: ("hello/world\\path/Splitter.cpp", "\\/", 3, sstream) results in sstream << "hel/wor\\pat/Splitter.cpp"
  */
-void truncateBeforeTokens(const char* str, const char *tokens, int maxBetweenTokens, std::stringstream& sstream);
+void truncateBeforeTokens(const char *str, const StaticString &tokens, int maxBetweenTokens, ostream &sstream);
 
 /**
  * Look for 'toFind' inside 'str', replace it with 'replaceWith' and return the result.

data/ext/common/agents/Base.cpp

@@ -1518,7 +1518,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 				argc - argStartIndex);
 		}
 
-		initializeAgentOptions(options, preinit);
+		initializeAgentOptions(processName, options, preinit);
 	} catch (const tracable_exception &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 		exit(1);
@@ -1546,7 +1546,9 @@ initializeAgent(int argc, char **argv[], const char *processName,
 }
 
 void
-initializeAgentOptions(VariantMap &options, PreinitializationFunc preinit) {
+initializeAgentOptions(const char *processName, VariantMap &options,
+	PreinitializationFunc preinit)
+{
 	ResourceLocator locator;
 	string ruby;
 
@@ -1579,10 +1581,60 @@ initializeAgentOptions(VariantMap &options, PreinitializationFunc preinit) {
 	if (preinit != NULL) {
 		preinit(options);
 	}
+
 	options.setDefaultInt("log_level", DEFAULT_LOG_LEVEL);
 	setLogLevel(options.getInt("log_level"));
-	if (options.has("debug_log_file")) {
-		setLogFile(options.get("debug_log_file").c_str());
+	string logFile;
+	if (options.has("log_file")) {
+		logFile = options.get("log_file");
+	} else if (options.has("debug_log_file")) {
+		logFile = options.get("debug_log_file");
+	}
+	if (!logFile.empty()) {
+		try {
+			logFile = absolutizePath(logFile);
+		} catch (const SystemException &e) {
+			P_WARN("Cannot absolutize filename '" << logFile
+				<< "': " << e.what());
+		}
+		setLogFile(logFile);
+	}
+
+	if (options.has("file_descriptor_log_file")) {
+		logFile = options.get("file_descriptor_log_file");
+		try {
+			logFile = absolutizePath(logFile);
+		} catch (const SystemException &e) {
+			P_WARN("Cannot absolutize filename '" << logFile
+				<< "': " << e.what());
+		}
+		setFileDescriptorLogFile(logFile);
+
+		// This information helps dev/parse_file_descriptor_log.
+		FastStringStream<> stream;
+		_prepareLogEntry(stream, __FILE__, __LINE__);
+		stream << "Starting agent: " << processName << "\n";
+		_writeFileDescriptorLogEntry(stream.data(), stream.size());
+
+		P_LOG_FILE_DESCRIPTOR_OPEN4(getFileDescriptorLogFileFd(), __FILE__, __LINE__,
+			"file descriptor log file " << options.get("file_descriptor_log_file"));
+	} else {
+		// This information helps dev/parse_file_descriptor_log.
+		P_DEBUG("Starting agent: " << processName);
+	}
+
+	if (hasEnvOption("PASSENGER_USE_FEEDBACK_FD")) {
+		P_LOG_FILE_DESCRIPTOR_OPEN2(FEEDBACK_FD, "feedback FD");
+	}
+	if (emergencyPipe1[0] != -1) {
+		P_LOG_FILE_DESCRIPTOR_OPEN4(emergencyPipe1[0], __FILE__, __LINE__,
+			"Emergency pipe 1-0");
+		P_LOG_FILE_DESCRIPTOR_OPEN4(emergencyPipe1[1], __FILE__, __LINE__,
+			"Emergency pipe 1-1");
+		P_LOG_FILE_DESCRIPTOR_OPEN4(emergencyPipe2[0], __FILE__, __LINE__,
+			"Emergency pipe 2-0");
+		P_LOG_FILE_DESCRIPTOR_OPEN4(emergencyPipe2[1], __FILE__, __LINE__,
+			"Emergency pipe 2-1");
 	}
 }
 

data/ext/common/agents/Base.h

@@ -43,7 +43,8 @@ bool feedbackFdAvailable();
 VariantMap initializeAgent(int argc, char **argv[], const char *processName,
 	OptionParserFunc optionParser = NULL, PreinitializationFunc preinit = NULL,
 	int argStartIndex = 1);
-void initializeAgentOptions(VariantMap &options, PreinitializationFunc preinit = NULL);
+void initializeAgentOptions(const char *processName, VariantMap &options,
+	PreinitializationFunc preinit = NULL);
 void installAgentAbortHandler();
 void installDiagnosticsDumper(DiagnosticsDumper func, void *userData);
 

data/ext/common/agents/HelperAgent/AdminServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2014 Phusion
+ *  Copyright (c) 2013-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -25,6 +25,7 @@
 #ifndef _PASSENGER_SERVER_AGENT_ADMIN_SERVER_H_
 #define _PASSENGER_SERVER_AGENT_ADMIN_SERVER_H_
 
+#include <boost/regex.hpp>
 #include <oxt/thread.hpp>
 #include <sstream>
 #include <string>
@@ -75,6 +76,12 @@ private:
 	typedef ServerKit::HttpClient<Request> Client;
 	typedef ServerKit::HeaderTable HeaderTable;
 
+	boost::regex serverConnectionPath;
+
+	bool regex_match(const StaticString &str, const boost::regex &e) const {
+		return boost::regex_match(str.data(), str.data() + str.size(), e);
+	}
+
 	bool parseAuthorizationHeader(Request *req, string &username,
 		string &password) const
 	{
@@ -126,6 +133,19 @@ private:
 			&& constantTimeCompare(password, auth->password);
 	}
 
+	int extractThreadNumberFromClientName(const string &clientName) const {
+		boost::smatch results;
+		boost::regex re("^([0-9]+)-.*");
+
+		if (!boost::regex_match(clientName, results, re)) {
+			return -1;
+		}
+		if (results.size() != 2) {
+			return -1;
+		}
+		return stringToUint(results.str(1));
+	}
+
 	static VariantMap parseQueryString(const StaticString &query) {
 		VariantMap params;
 		const char *pos = query.data();
@@ -155,6 +175,52 @@ private:
 		return params;
 	}
 
+	static void disconnectClient(RequestHandler *rh, string clientName) {
+		rh->disconnect(clientName);
+	}
+
+	void processServerConnectionOperation(Client *client, Request *req) {
+		if (!authorize(client, req, FULL)) {
+			respondWith401(client, req);
+		} else if (req->method == HTTP_DELETE) {
+			StaticString path = req->getPathWithoutQueryString();
+			boost::smatch results;
+
+			boost::regex_match(path.toString(), results, serverConnectionPath);
+			if (results.size() != 2) {
+				endAsBadRequest(&client, &req, "Invalid URI");
+				return;
+			}
+
+			int threadNumber = extractThreadNumberFromClientName(results.str(1));
+			P_WARN(results.str(1));
+			P_WARN(threadNumber);
+			if (threadNumber < 1 || (unsigned int) threadNumber > requestHandlers.size()) {
+				HeaderTable headers;
+				headers.insert(req->pool, "content-type", "application/json");
+				writeSimpleResponse(client, 400, &headers,
+					"{ \"status\": \"error\", \"reason\": \"Invalid thread number\" }");
+				if (!req->ended()) {
+					endRequest(&client, &req);
+				}
+				return;
+			}
+
+			requestHandlers[threadNumber - 1]->getContext()->libev->runLater(boost::bind(
+				disconnectClient, requestHandlers[threadNumber - 1], results.str(1)));
+
+			HeaderTable headers;
+			headers.insert(req->pool, "content-type", "application/json");
+			writeSimpleResponse(client, 200, &headers,
+				"{ \"status\": \"ok\" }");
+			if (!req->ended()) {
+				endRequest(&client, &req);
+			}
+		} else {
+			respondWith405(client, req);
+		}
+	}
+
 	static void inspectRequestHandlerState(RequestHandler *rh, Json::Value *json) {
 		*json = rh->inspectStateAsJson();
 	}
@@ -396,6 +462,7 @@ private:
 
 			HeaderTable headers;
 			string logFile = getLogFile();
+			string fileDescriptorLogFile = getFileDescriptorLogFile();
 
 			headers.insert(req->pool, "content-type", "application/json");
 			Json::Value doc;
@@ -405,6 +472,9 @@ private:
 			if (!logFile.empty()) {
 				doc["log_file"] = logFile;
 			}
+			if (!fileDescriptorLogFile.empty()) {
+				doc["file_descriptor_log_file"] = fileDescriptorLogFile;
+			}
 
 			writeSimpleResponse(client, 200, &headers,
 				psg_pstrdup(req->pool, doc.toStyledString()));
@@ -438,8 +508,24 @@ private:
 			setLogLevel(json["log_level"].asInt());
 		}
 		if (json.isMember("log_file")) {
-			if (!setLogFile(json["log_file"].asCString())) {
-				int e = errno;
+			string logFile = json["log_file"].asString();
+			try {
+				logFile = absolutizePath(logFile);
+			} catch (const SystemException &e) {
+				unsigned int bufsize = 1024;
+				char *message = (char *) psg_pnalloc(req->pool, bufsize);
+				snprintf(message, bufsize, "{ \"status\": \"error\", "
+					"\"message\": \"Cannot absolutize log file filename: %s\" }",
+					e.what());
+				writeSimpleResponse(client, 500, &headers, message);
+				if (!req->ended()) {
+					endRequest(&client, &req);
+				}
+				return;
+			}
+
+			int e;
+			if (!setLogFile(logFile, &e)) {
 				unsigned int bufsize = 1024;
 				char *message = (char *) psg_pnalloc(req->pool, bufsize);
 				snprintf(message, bufsize, "{ \"status\": \"error\", "
@@ -468,6 +554,7 @@ private:
 		if (req->method != HTTP_POST) {
 			respondWith405(client, req);
 		} else if (authorize(client, req, FULL)) {
+			int e;
 			HeaderTable headers;
 			headers.insert(req->pool, "content-type", "application/json");
 
@@ -476,25 +563,46 @@ private:
 				writeSimpleResponse(client, 500, &headers, "{ \"status\": \"error\", "
 					"\"code\": \"NO_LOG_FILE\", "
 					"\"message\": \"" PROGRAM_NAME " was not configured with a log file.\" }\n");
-			} else {
-				if (!setLogFile(logFile.c_str())) {
-					int e = errno;
+				if (!req->ended()) {
+					endRequest(&client, &req);
+				}
+				return;
+			}
+
+			if (!setLogFile(logFile, &e)) {
+				unsigned int bufsize = 1024;
+				char *message = (char *) psg_pnalloc(req->pool, bufsize);
+				snprintf(message, bufsize, "{ \"status\": \"error\", "
+					"\"code\": \"LOG_FILE_OPEN_ERROR\", "
+					"\"message\": \"Cannot reopen log file %s: %s (errno=%d)\" }",
+					logFile.c_str(), strerror(e), e);
+				writeSimpleResponse(client, 500, &headers, message);
+				if (!req->ended()) {
+					endRequest(&client, &req);
+				}
+				return;
+			}
+			P_NOTICE("Log file reopened.");
+
+			if (hasFileDescriptorLogFile()) {
+				if (!setFileDescriptorLogFile(getFileDescriptorLogFile(), &e)) {
 					unsigned int bufsize = 1024;
 					char *message = (char *) psg_pnalloc(req->pool, bufsize);
 					snprintf(message, bufsize, "{ \"status\": \"error\", "
-						"\"code\": \"LOG_FILE_OPEN_ERROR\", "
-						"\"message\": \"Cannot reopen log file: %s (errno=%d)\" }",
-						strerror(e), e);
+						"\"code\": \"FD_LOG_FILE_OPEN_ERROR\", "
+						"\"message\": \"Cannot reopen file descriptor log file %s: %s (errno=%d)\" }",
+						getFileDescriptorLogFile().c_str(), strerror(e), e);
 					writeSimpleResponse(client, 500, &headers, message);
 					if (!req->ended()) {
 						endRequest(&client, &req);
 					}
 					return;
 				}
-				P_NOTICE("Log file reopened.");
-				writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }\n");
+				P_NOTICE("File descriptor log file reopened.");
 			}
 
+			writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }\n");
+
 			if (!req->ended()) {
 				endRequest(&client, &req);
 			}
@@ -568,6 +676,8 @@ protected:
 		try {
 			if (path == P_STATIC_STRING("/server.json")) {
 				processServerStatus(client, req);
+			} else if (regex_match(path, serverConnectionPath)) {
+				processServerConnectionOperation(client, req);
 			} else if (path == P_STATIC_STRING("/pool.xml")) {
 				processPoolStatusXml(client, req);
 			} else if (path == P_STATIC_STRING("/pool.txt")) {
@@ -665,6 +775,7 @@ public:
 
 	AdminServer(ServerKit::Context *context)
 		: ParentClass(context),
+		  serverConnectionPath("^/server/(.+)\\.json$"),
 		  exitEvent(NULL)
 		{ }