passenger 5.0.4 → 5.0.5

data/ext/common/agents/HelperAgent/Main.cpp

@@ -146,7 +146,9 @@ namespace ServerAgent {
 		oxt::thread *prestarterThread;
 
 		WorkingObjects()
-			: terminationCount(0),
+			: exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
+			  allClientsDisconnectedEvent(__FILE__, __LINE__, "WorkingObjects: allClientsDisconnectedEvent"),
+			  terminationCount(0),
 			  shutdownCounter(0)
 		{
 			for (unsigned int i = 0; i < SERVER_KIT_MAX_SERVER_ENDPOINTS; i++) {
@@ -274,13 +276,19 @@ startListening() {
 	vector<string> adminAddresses = agentsOptions->getStrSet("server_admin_addresses", false);
 
 	for (unsigned int i = 0; i < addresses.size(); i++) {
-		wo->serverFds[i] = createServer(addresses[i]);
+		wo->serverFds[i] = createServer(addresses[i], 0, true,
+			__FILE__, __LINE__);
+		P_LOG_FILE_DESCRIPTOR_PURPOSE(wo->serverFds[i],
+			"Server address: " << addresses[i]);
 		if (getSocketAddressType(addresses[i]) == SAT_UNIX) {
 			makeFileWorldReadableAndWritable(parseUnixSocketAddress(addresses[i]));
 		}
 	}
 	for (unsigned int i = 0; i < adminAddresses.size(); i++) {
-		wo->adminServerFds[i] = createServer(adminAddresses[i]);
+		wo->adminServerFds[i] = createServer(adminAddresses[i], 0, true,
+			__FILE__, __LINE__);
+		P_LOG_FILE_DESCRIPTOR_PURPOSE(wo->adminServerFds[i],
+			"AdminServer address: " << adminAddresses[i]);
 		if (getSocketAddressType(adminAddresses[i]) == SAT_UNIX) {
 			makeFileWorldReadableAndWritable(parseUnixSocketAddress(adminAddresses[i]));
 		}
@@ -303,8 +311,8 @@ createPidFile() {
 		}
 
 		UPDATE_TRACE_POINT();
+		FdGuard guard(fd, __FILE__, __LINE__);
 		writeExact(fd, pidStr, strlen(pidStr));
-		syscalls::close(fd);
 	}
 }
 
@@ -937,7 +945,10 @@ preinitialize(VariantMap &options) {
 		options.setInt("log_level", options.getInt("server_log_level"));
 	}
 	if (options.has("server_log_file")) {
-		options.set("debug_log_file", options.get("server_log_file"));
+		options.set("log_file", options.get("server_log_file"));
+	}
+	if (options.has("server_file_descriptor_log_file")) {
+		options.set("file_descriptor_log_file", options.get("server_file_descriptor_log_file"));
 	}
 }
 

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

@@ -139,6 +139,7 @@ serverUsage() {
 	printf("Other options (optional):\n");
 	printf("      --log-file PATH       Log to the given file.\n");
 	printf("      --log-level LEVEL     Logging level. Default: %d\n", DEFAULT_LOG_LEVEL);
+	printf("      --fd-log-file PATH    Log file descriptor activity to the given file.\n");
 	printf("      --stat-throttle-rate SECONDS\n");
 	printf("                            Throttle filesystem restart.txt checks to at most\n");
 	printf("                            once per given seconds. Default: %d\n", DEFAULT_STAT_THROTTLE_RATE);
@@ -308,10 +309,15 @@ parseServerOption(int argc, const char *argv[], int &i, VariantMap &options) {
 		options.setInt("server_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
+		// We do not set 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("server_log_file", argv[i + 1]);
 		i += 2;
+	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--fd-log-file")) {
+		// We do not set file_descriptor_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("server_file_descriptor_log_file", argv[i + 1]);
+		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--stat-throttle-rate")) {
 		options.setInt("stat_throttle_rate", atoi(argv[i + 1]));
 		i += 2;

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

@@ -424,7 +424,7 @@ public:
 			if (req->session->isClosed()) {
 				sessionDoc["closed"] = true;
 			} else {
-				sessionDoc["pid"] = session->getPid();
+				sessionDoc["pid"] = (Json::Int64) session->getPid();
 				sessionDoc["gupid"] = session->getGupid().toString();
 			}
 		}

data/ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp

@@ -30,6 +30,8 @@ public:
 virtual unsigned int getClientName(const Client *client, char *buf, size_t size) const {
 	char *pos = buf;
 	const char *end = buf + size - 1;
+	// WARNING: If you change the format, be sure to change
+	// AdminServer::extractThreadNumberFromClientName() too.
 	pos += uintToString(threadNumber, pos, end - pos);
 	pos = appendData(pos, end, "-", 1);
 	pos += uintToString(client->number, pos, end - pos);
@@ -85,6 +87,7 @@ virtual void reinitializeRequest(Client *client, Request *req) {
 	req->stickySession = false;
 	req->halfCloseAppConnection = false;
 	req->sessionCheckoutTry = 0;
+	req->appResponseInitialized = false;
 	req->strip100ContinueHeader = false;
 	req->hasPragmaHeader = false;
 	req->host = NULL;
@@ -119,7 +122,9 @@ virtual void deinitializeRequest(Client *client, Request *req) {
 	/***************/
 	/***************/
 
-	deinitializeAppResponse(client, req);
+	if (req->appResponseInitialized) {
+		deinitializeAppResponse(client, req);
+	}
 
 	ParentClass::deinitializeRequest(client, req);
 }
@@ -127,6 +132,8 @@ virtual void deinitializeRequest(Client *client, Request *req) {
 void reinitializeAppResponse(Client *client, Request *req) {
 	AppResponse *resp = &req->appResponse;
 
+	req->appResponseInitialized = true;
+
 	resp->httpMajor = 1;
 	resp->httpMinor = 0;
 	resp->httpState = AppResponse::PARSING_HEADERS;
@@ -152,6 +159,8 @@ void reinitializeAppResponse(Client *client, Request *req) {
 void deinitializeAppResponse(Client *client, Request *req) {
 	AppResponse *resp = &req->appResponse;
 
+	req->appResponseInitialized = false;
+
 	if (resp->httpState == AppResponse::PARSING_HEADERS
 	 && resp->parserState.headerParser != NULL)
 	{

data/ext/common/agents/HelperAgent/RequestHandler/Request.h

@@ -27,6 +27,7 @@
 
 #include <ev++.h>
 #include <string>
+#include <cstring>
 
 #include <ServerKit/HttpRequest.h>
 #include <ServerKit/FdSinkChannel.h>
@@ -67,6 +68,7 @@ public:
 
 	// Range: 0..MAX_SESSION_CHECKOUT_TRY
 	boost::uint8_t sessionCheckoutTry;
+	bool appResponseInitialized: 1;
 	bool strip100ContinueHeader: 1;
 	bool hasPragmaHeader: 1;
 
@@ -100,6 +102,12 @@ public:
 	#endif
 
 
+	Request()
+		: BaseHttpRequest()
+	{
+		memset(&scopeLogs, 0, sizeof(scopeLogs));
+	}
+
 	const char *getStateString() const {
 		switch (state) {
 		case ANALYZING_REQUEST:

data/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.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.
  *
@@ -28,6 +28,7 @@
 #include <oxt/backtrace.hpp>
 #include <ev++.h>
 #include <ctime>
+#include <cstddef>
 #include <cassert>
 #include <MemoryKit/mbuf.h>
 #include <ServerKit/Context.h>
@@ -176,8 +177,8 @@ private:
 
 		#ifndef NDEBUG
 			if (output != NULL) {
-				assert(pos - output == result);
-				assert(pos - output <= outputSize);
+				assert(size_t(pos - output) == size_t(result));
+				assert(size_t(pos - output) <= size_t(outputSize));
 			}
 		#endif
 		return result;

data/ext/common/agents/LoggingAgent/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.
  *
@@ -159,9 +159,17 @@ private:
 
 			HeaderTable headers;
 			Json::Value doc;
+			string logFile = getLogFile();
+			string fileDescriptorLogFile = getFileDescriptorLogFile();
 
 			headers.insert(req->pool, "content-type", "application/json");
 			doc["log_level"] = getLogLevel();
+			if (!logFile.empty()) {
+				doc["log_file"] = logFile;
+			}
+			if (!fileDescriptorLogFile.empty()) {
+				doc["file_descriptor_log_file"] = fileDescriptorLogFile;
+			}
 
 			writeSimpleResponse(client, 200, &headers, doc.toStyledString());
 			if (!req->ended()) {
@@ -189,8 +197,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\", "
@@ -215,6 +239,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");
 
@@ -223,25 +248,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);
 			}

data/ext/common/agents/LoggingAgent/LoggingServer.h

@@ -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.
  *
@@ -157,9 +157,9 @@ private:
 			} else {
 				this->filename = filename;
 			}
-			fd = syscalls::open(filename.c_str(),
+			fd.assign(syscalls::open(filename.c_str(),
 				O_CREAT | O_WRONLY | O_APPEND,
-				0600);
+				0600), __FILE__, __LINE__);
 			if (fd == -1) {
 				int e = errno;
 				throw FileSystemException("Cannnot open file", e, filename);

data/ext/common/agents/LoggingAgent/Main.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.
  *
@@ -91,6 +91,8 @@ namespace LoggingAgent {
 			  bgloop(NULL),
 			  serverKitContext(NULL),
 			  loggingServer(NULL),
+			  exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
+			  allClientsDisconnectedEvent(__FILE__, __LINE__, "WorkingObjects: allClientsDisconnectedEvent"),
 			  terminationCount(0)
 			{ }
 	};
@@ -201,7 +203,10 @@ startListening() {
 	vector<string> adminAddresses;
 
 	address = options.get("logging_agent_address");
-	wo->serverSocketFd = createServer(address.c_str());
+	wo->serverSocketFd.assign(createServer(address, 0, true,
+		__FILE__, __LINE__), NULL, 0);
+	P_LOG_FILE_DESCRIPTOR_PURPOSE(wo->serverSocketFd,
+		"Server address: " << wo->serverSocketFd);
 	if (getSocketAddressType(address) == SAT_UNIX) {
 		makeFileWorldReadableAndWritable(parseUnixSocketAddress(address));
 	}
@@ -210,7 +215,10 @@ startListening() {
 	adminAddresses = options.getStrSet("logging_agent_admin_addresses",
 		false);
 	foreach (address, adminAddresses) {
-		wo->adminSockets.push_back(createServer(address));
+		wo->adminSockets.push_back(createServer(address, 0, true,
+			__FILE__, __LINE__));
+		P_LOG_FILE_DESCRIPTOR_PURPOSE(wo->adminSockets.back(),
+			"Server address: " << wo->adminSockets.back());
 		if (getSocketAddressType(address) == SAT_UNIX) {
 			makeFileWorldReadableAndWritable(parseUnixSocketAddress(address));
 		}

data/ext/common/agents/Watchdog/AdminServer.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.
  *
@@ -177,12 +177,16 @@ private:
 			HeaderTable headers;
 			Json::Value doc;
 			string logFile = getLogFile();
+			string fileDescriptorLogFile = getFileDescriptorLogFile();
 
 			headers.insert(req->pool, "content-type", "application/json");
 			doc["log_level"] = getLogLevel();
 			if (!logFile.empty()) {
 				doc["log_file"] = logFile;
 			}
+			if (!fileDescriptorLogFile.empty()) {
+				doc["file_descriptor_log_file"] = fileDescriptorLogFile;
+			}
 
 			writeSimpleResponse(client, 200, &headers, doc.toStyledString());
 			if (!req->ended()) {
@@ -210,8 +214,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\", "
@@ -236,6 +256,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");
 
@@ -244,25 +265,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);
 			}