passenger 3.9.1.beta → 3.9.2.beta

data/test/cxx/MessageReadersWritersTest.cpp

@@ -1,7 +1,6 @@
 #include <TestSupport.h>
 #include <MessageReadersWriters.h>
 #include <cstdlib>
-#include <alloca.h>
 
 using namespace Passenger;
 using namespace std;
@@ -384,10 +383,10 @@ namespace tut {
 	TEST_METHOD(34) {
 		// generate() works.
 		StaticString args[] = { "ab", "cde" };
-		StaticString *out = (StaticString *)
-			alloca(ArrayMessage::outputSize(2) * sizeof(StaticString));
+		vector<StaticString> out;
+		out.resize(ArrayMessage::outputSize(2));
 		char buf[sizeof(uint16_t)];
-		ArrayMessage::generate(args, 2, buf, out, ArrayMessage::outputSize(2));
+		ArrayMessage::generate(args, 2, buf, &out[0], ArrayMessage::outputSize(2));
 		
 		string concat;
 		for (unsigned int i = 0; i < ArrayMessage::outputSize(2); i++) {

data/test/cxx/RequestHandlerTest.cpp

@@ -289,12 +289,17 @@ namespace tut {
 		);
 		BufferedIO io(connection);
 		ensure_equals(io.readLine(), "HTTP/1.1 200 OK\r\n");
-		ensure_equals(pool->getProcessCount(), 1u);
-		SuperGroupPtr superGroup = pool->superGroups.get(wsgiAppPath);
-		ProcessPtr process = superGroup->defaultGroup->processes.front();
-		ensure_equals(process->sessions, 1);
+		ProcessPtr process;
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(pool->getProcessCount(false), 1u);
+			SuperGroupPtr superGroup = pool->superGroups.get(wsgiAppPath);
+			process = superGroup->defaultGroup->enabledProcesses.front();
+			ensure_equals(process->sessions, 1);
+		}
 		connection.close();
 		EVENTUALLY(5,
+			LockGuard l(pool->syncher);
 			result = process->sessions == 0;
 		);
 	}
@@ -307,7 +312,7 @@ namespace tut {
 			"STDERR.puts 'I have failed'");
 
 		setLogLevel(-2);
-		spawnerFactory->forwardStderr = false;
+		spawnerFactory->getConfig()->forwardStderr = false;
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -332,7 +337,7 @@ namespace tut {
 			"STDERR.puts 'I have failed'\n");
 
 		setLogLevel(-2);
-		spawnerFactory->forwardStderr = false;
+		spawnerFactory->getConfig()->forwardStderr = false;
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -355,7 +360,7 @@ namespace tut {
 		writeFile("tmp.handler/start.rb", "");
 
 		setLogLevel(-2);
-		spawnerFactory->forwardStderr = false;
+		spawnerFactory->getConfig()->forwardStderr = false;
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -383,7 +388,7 @@ namespace tut {
 			"STDERR.puts 'I have failed'");
 
 		setLogLevel(-2);
-		spawnerFactory->forwardStderr = false;
+		spawnerFactory->getConfig()->forwardStderr = false;
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -409,7 +414,7 @@ namespace tut {
 			"STDERR.puts 'I have failed'\n");
 
 		setLogLevel(-2);
-		spawnerFactory->forwardStderr = false;
+		spawnerFactory->getConfig()->forwardStderr = false;
 		init();
 		connect();
 		sendHeaders(defaultHeaders,
@@ -772,6 +777,61 @@ namespace tut {
 		ensure_equals(buf.st_size, (off_t) 0);
 	}
 
+	TEST_METHOD(46) {
+		// If the application outputs a request oobw header, handler should remove the header, mark
+		// the process as oobw requested. The process should continue to process requests until the
+		// spawner spawns another process (to avoid the group being empty). As soon as the new 
+		// process is spawned, the original process will make the oobw request. Afterwards, the 
+		// original process is re-enabled.
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/oobw",
+			NULL);
+		string response = readAll(connection);
+		ensure("status is not 200", containsSubstring(response, "Status: 200 OK\r\n"));
+		ensure("contains oowb header", !containsSubstring(response, "X-Passenger-Request-OOB-Work:"));
+		pid_t origPid = atoi(stripHeaders(response));
+		
+		// Get a reference to the orignal process and verify oobw has been requested.
+		ProcessPtr origProcess;
+		{
+			unique_lock<boost::mutex> lock(pool->syncher);
+			origProcess = pool->superGroups.get(wsgiAppPath)->defaultGroup->disablingProcesses.front();
+			ensure(origProcess->oobwRequested);
+		}
+		ensure("sanity check", origPid == origProcess->pid); // just a sanity check
+		
+		// Issue requests until the new process handles it.
+		pid_t pid;
+		EVENTUALLY(2,
+			connect();
+			sendHeaders(defaultHeaders,
+				"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+				"PATH_INFO", "/pid",
+				NULL);
+			string response = readAll(connection);
+			ensure(containsSubstring(response, "Status: 200 OK\r\n"));
+			pid = atoi(stripHeaders(response));
+			result = (pid != origPid);
+		);
+		
+		// Wait for the original process to finish oobw request.
+		EVENTUALLY(2,
+			unique_lock<boost::mutex> lock(pool->syncher);
+			result = !origProcess->oobwRequested;
+		);
+		
+		// Final asserts.
+		{
+			unique_lock<boost::mutex> lock(pool->syncher);
+			ensure("2 enabled processes", pool->superGroups.get(wsgiAppPath)->defaultGroup->enabledProcesses.size() == 2);
+			ensure("oobw is reset", !origProcess->oobwRequested);
+			ensure("process is enabled", origProcess->enabled == Process::ENABLED);
+		}
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
 }

data/test/cxx/TestSupport.h

@@ -57,7 +57,9 @@ using namespace oxt;
 		unsigned long long deadlineTime = SystemTime::getMsec(true) + deadlineMsec;	\
 		bool result = false;							\
 		while (!result && SystemTime::getMsec(true) < deadlineTime) {		\
-			code								\
+			{										\
+				code								\
+			}										\
 			if (!result) {							\
 				usleep(sleepTimeMsec * 1000);				\
 			}								\

data/test/cxx/UnionStationTest.cpp

@@ -19,11 +19,6 @@ namespace tut {
 		static const unsigned long long YESTERDAY = 1263299017000000ull;  // January 12, 2009, 12:23:37 UTC
 		static const unsigned long long TODAY     = 1263385422000000ull;  // January 13, 2009, 12:23:42 UTC
 		static const unsigned long long TOMORROW  = 1263471822000000ull;  // January 14, 2009, 12:23:42 UTC
-		#define FOOBAR_MD5 "3858f62230ac3c915f300c664312c63f"
-		#define LOCALHOST_MD5 "421aa90e079fa326b6494f812ad13e79"
-		#define REMOTEHOST_MD5 "2c18e486683a3db1e645ad8523223b72"
-		#define FOOBAR_LOCALHOST_PREFIX FOOBAR_MD5 "/" LOCALHOST_MD5
-		#define FOOBAR_REMOTEHOST_PREFIX FOOBAR_MD5 "/" REMOTEHOST_MD5
 		#define TODAY_TXN_ID "cjb8n-abcd"
 		#define TODAY_TIMESTAMP_STR "cftz90m3k0"
 		
@@ -31,7 +26,7 @@ namespace tut {
 		ServerInstanceDir::GenerationPtr generation;
 		string socketFilename;
 		string socketAddress;
-		string loggingDir;
+		string dumpFile;
 		AccountsDatabasePtr accountsDatabase;
 		ev::dynamic_loop eventLoop;
 		FileDescriptor serverFd;
@@ -43,7 +38,7 @@ namespace tut {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			socketFilename = generation->getPath() + "/logging.socket";
 			socketAddress = "unix:" + socketFilename;
-			loggingDir = generation->getPath() + "/logs";
+			dumpFile = generation->getPath() + "/log.txt";
 			accountsDatabase = ptr(new AccountsDatabase());
 			accountsDatabase->add("test", "1234", false);
 			setLogLevel(-1);
@@ -68,7 +63,7 @@ namespace tut {
 		void startLoggingServer(const function<void ()> &initFunc = function<void ()>()) {
 			serverFd = createUnixServer(socketFilename.c_str());
 			server = ptr(new LoggingServer(eventLoop,
-				serverFd, accountsDatabase, loggingDir));
+				serverFd, accountsDatabase, dumpFile));
 			if (initFunc) {
 				initFunc();
 			}
@@ -116,6 +111,10 @@ namespace tut {
 			}
 			return client;
 		}
+
+		string readDumpFile() {
+			return readAll(dumpFile);
+		}
 	};
 	
 	DEFINE_TEST_GROUP(UnionStationTest);
@@ -137,7 +136,7 @@ namespace tut {
 		
 		log.reset();
 		
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
+		string data = readDumpFile();
 		ensure(data.find("hello\n") != string::npos);
 		ensure(data.find("world\n") != string::npos);
 	}
@@ -158,7 +157,7 @@ namespace tut {
 		log.reset();
 		log2.reset();
 		
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
+		string data = readDumpFile();
 		ensure("(1)", data.find("message 1\n") != string::npos);
 		ensure("(2)", data.find("message 2\n") != string::npos);
 	}
@@ -186,12 +185,11 @@ namespace tut {
 		log2.reset();
 		log3.reset();
 		
-		string yesterdayData = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
-		string tomorrowData = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/14/12/log.txt");
-		ensure("(1)", yesterdayData.find(timestampString(YESTERDAY) + " 1 message 1\n") != string::npos);
-		ensure("(2)", yesterdayData.find(timestampString(TODAY) + " 2 message 2\n") != string::npos);
-		ensure("(3)", yesterdayData.find(timestampString(TOMORROW) + " 4 message 3\n") != string::npos);
-		ensure("(4)", tomorrowData.find(timestampString(TOMORROW) + " 1 message 4\n") != string::npos);
+		string data = readDumpFile();
+		ensure("(1)", data.find(timestampString(YESTERDAY) + " 1 message 1\n") != string::npos);
+		ensure("(2)", data.find(timestampString(TODAY) + " 2 message 2\n") != string::npos);
+		ensure("(3)", data.find(timestampString(TOMORROW) + " 4 message 3\n") != string::npos);
+		ensure("(4)", data.find(timestampString(TOMORROW) + " 1 message 4\n") != string::npos);
 	}
 	
 	TEST_METHOD(4) {
@@ -211,7 +209,7 @@ namespace tut {
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
+		string data = readDumpFile();
 		ensure("(1)", data.find(timestampString(YESTERDAY) + " 0 ATTACH\n") != string::npos);
 		ensure("(2)", data.find(timestampString(TODAY) + " 1 ATTACH\n") != string::npos);
 		ensure("(3)", data.find(timestampString(TODAY) + " 2 DETACH\n") != string::npos);
@@ -238,7 +236,7 @@ namespace tut {
 		Logger log;
 		ensure(log.isNull());
 		log.message("hello world");
-		ensure_equals(getFileType(loggingDir), FT_NONEXISTANT);
+		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
 	}
 	
 	TEST_METHOD(7) {
@@ -249,25 +247,7 @@ namespace tut {
 		LoggerPtr log = factory.newTransaction("foo");
 		ensure(log->isNull());
 		log->message("hello world");
-		ensure_equals(getFileType(loggingDir), FT_NONEXISTANT);
-	}
-	
-	TEST_METHOD(8) {
-		// It creates a file group_name.txt under the group directory.
-		LoggerPtr log = factory->newTransaction("foobar");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-		string data = readAll(loggingDir + "/1/" FOOBAR_MD5 "/group_name.txt");
-		ensure_equals(data, "foobar");
-	}
-	
-	TEST_METHOD(9) {
-		// It creates a file node_name.txt under the node directory.
-		LoggerPtr log = factory->newTransaction("foobar");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/node_name.txt");
-		ensure_equals(data, "localhost");
+		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
 	}
 	
 	TEST_METHOD(11) {
@@ -318,8 +298,9 @@ namespace tut {
 		log.reset();
 		log2.reset();
 		
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt");
-		ensure("(5)", data.find("hello\n") != string::npos);
+		EVENTUALLY(3,
+			result = readDumpFile().find("hello\n") != string::npos;
+		);
 	}
 	
 	TEST_METHOD(13) {
@@ -347,33 +328,36 @@ namespace tut {
 	TEST_METHOD(14) {
 		// If a client disconnects from the logging server then all its
 		// transactions that are no longer referenced and have crash protection enabled
-		// will be closed and written to to the sink.
+		// will be closed and written to the sink.
 		MessageClient client1 = createConnection();
 		MessageClient client2 = createConnection();
 		MessageClient client3 = createConnection();
 		vector<string> args;
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt";
 		
 		SystemTime::forceAll(TODAY);
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", NULL);
+			"", "true", "true", NULL);
+		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"", "true", NULL);
+		client2.write("log", TODAY_TXN_ID, "1000", NULL);
+		client2.writeScalar("hello world");
 		client2.write("flush", NULL);
 		client2.read(args);
 		client2.disconnect();
-		
 		SHOULD_NEVER_HAPPEN(100,
-			result = fileExists(filename) && !readAll(filename).empty();
+			// Transaction still has references open, so should not yet be written to sink.
+			result = readDumpFile().find("hello world") != string::npos;
 		);
+
 		client1.disconnect();
 		client3.write("flush", NULL);
 		client3.read(args);
 		EVENTUALLY(5,
-			result = fileExists(filename) && !readAll(filename).empty();
+			result = readDumpFile().find("hello world") != string::npos;
 		);
 	}
 	
@@ -385,13 +369,13 @@ namespace tut {
 		MessageClient client2 = createConnection();
 		MessageClient client3 = createConnection();
 		vector<string> args;
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt";
 		
 		SystemTime::forceAll(TODAY);
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", NULL);
+			"", "false", "true", NULL);
+		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"", "false", NULL);
@@ -402,7 +386,7 @@ namespace tut {
 		client3.write("flush", NULL);
 		client3.read(args);
 		SHOULD_NEVER_HAPPEN(500,
-			result = fileExists(filename) && !readAll(filename).empty();
+			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
 	
@@ -412,13 +396,13 @@ namespace tut {
 		MessageClient client1 = createConnection();
 		MessageClient client2 = createConnection();
 		vector<string> args;
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt";
 		
 		SystemTime::forceAll(TODAY);
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "true", NULL);
+			"", "true", "true", NULL);
+		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"", "true", NULL);
@@ -427,7 +411,7 @@ namespace tut {
 		
 		stopLoggingServer();
 		EVENTUALLY(5,
-			result = fileExists(filename) && !readAll(filename).empty();
+			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
 	
@@ -437,13 +421,13 @@ namespace tut {
 		MessageClient client1 = createConnection();
 		MessageClient client2 = createConnection();
 		vector<string> args;
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt";
 		
 		SystemTime::forceAll(TODAY);
 		
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
-			"", "false", NULL);
+			"", "false", "true", NULL);
+		client1.read(args);
 		client2.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"", "false", NULL);
@@ -452,7 +436,7 @@ namespace tut {
 		
 		stopLoggingServer();
 		SHOULD_NEVER_HAPPEN(200,
-			result = fileExists(filename) && !readAll(filename).empty();
+			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
 	
@@ -527,35 +511,15 @@ namespace tut {
 		}
 	}
 	
-	TEST_METHOD(21) {
-		// The server temporarily buffers data in memory.
-		SystemTime::forceAll(YESTERDAY);
-		
-		LoggerPtr log = factory->newTransaction("foobar");
-		log->message("hello world");
-		log.reset();
-		
-		// Give server some time to process these commands.
-		usleep(20000);
-		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
-		struct stat buf;
-		ensure_equals(stat(filename.c_str(), &buf), 0);
-		ensure_equals(buf.st_size, (off_t) 0);
-	}
-	
 	TEST_METHOD(22) {
 		// The destructor flushes all data.
-		SystemTime::forceAll(YESTERDAY);
-		
 		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		stopLoggingServer();
 		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
 		struct stat buf;
-		ensure_equals(stat(filename.c_str(), &buf), 0);
+		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure(buf.st_size > 0);
 	}
 	
@@ -574,9 +538,8 @@ namespace tut {
 		ensure_equals(args.size(), 1u);
 		ensure_equals(args[0], "ok");
 		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
 		struct stat buf;
-		ensure_equals(stat(filename.c_str(), &buf), 0);
+		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure(buf.st_size > 0);
 	}
 	
@@ -602,9 +565,8 @@ namespace tut {
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
 		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
 		struct stat buf;
-		ensure_equals(stat(filename.c_str(), &buf), 0);
+		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure_equals(buf.st_size, (off_t) 0);
 	}
 	
@@ -735,7 +697,6 @@ namespace tut {
 		// One can supply a custom node name per openTransaction command.
 		MessageClient client1 = createConnection();
 		vector<string> args;
-		string filename = loggingDir + "/1/" FOOBAR_REMOTEHOST_PREFIX "/requests/2010/01/13/12/log.txt";
 		
 		SystemTime::forceAll(TODAY);
 		
@@ -747,7 +708,7 @@ namespace tut {
 		client1.read(args);
 		client1.disconnect();
 		
-		ensure(fileExists(filename));
+		ensure(fileExists(dumpFile));
 	}
 	
 	TEST_METHOD(30) {
@@ -773,7 +734,7 @@ namespace tut {
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		
-		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt");
+		string data = readDumpFile();
 		ensure("(1)", data.find("transaction 1\n") != string::npos);
 		ensure("(2)", data.find("transaction 2\n") == string::npos);
 	}