passenger 3.0.21 → 3.9.1.beta

data/test/cxx/TestSupport.h

@@ -18,10 +18,22 @@
 #include <oxt/tracable_exception.hpp>
 
 #include "../tut/tut.h"
-#include "ServerInstanceDir.h"
-#include "Exceptions.h"
-#include "Utils.h"
-#include "Utils/SystemTime.h"
+#include <ResourceLocator.h>
+#include <ServerInstanceDir.h>
+#include <BackgroundEventLoop.h>
+#include <Exceptions.h>
+#include <Utils.h>
+#include <Utils/SystemTime.h>
+#include <Utils/json-forwards.h>
+
+extern "C" {
+	struct ev_loop;
+	struct ev_async;
+}
+
+namespace Passenger {
+	class SafeLibev;
+}
 
 namespace TestSupport {
 
@@ -40,21 +52,23 @@ using namespace oxt;
 		}                                                     \
 	} while (0)
 
-#define EVENTUALLY(deadline, code)					\
-	do {								\
-		time_t deadlineTime = time(NULL) + deadline;		\
-		bool result = false;					\
-		while (!result && time(NULL) < deadlineTime) {		\
-			code						\
-			if (!result) {					\
-				usleep(10000);				\
-			}						\
-		}							\
-		if (!result) {						\
-			fail("EVENTUALLY(" #code ") failed");		\
-		}							\
+#define EVENTUALLY2(deadlineMsec, sleepTimeMsec, code)					\
+	do {										\
+		unsigned long long deadlineTime = SystemTime::getMsec(true) + deadlineMsec;	\
+		bool result = false;							\
+		while (!result && SystemTime::getMsec(true) < deadlineTime) {		\
+			code								\
+			if (!result) {							\
+				usleep(sleepTimeMsec * 1000);				\
+			}								\
+		}									\
+		if (!result) {								\
+			fail("EVENTUALLY(" #code ") failed");				\
+		}									\
 	} while (0)
 
+#define EVENTUALLY(deadlineSec, code) EVENTUALLY2(deadlineSec * 1000, 10, code)
+
 #define SHOULD_NEVER_HAPPEN(deadline, code)						\
 	do {										\
 		unsigned long long deadlineTime = SystemTime::getMsec(true) + deadline;	\
@@ -71,6 +85,10 @@ using namespace oxt;
 	} while (0)
 
 
+extern ResourceLocator *resourceLocator;
+extern Json::Value testConfig;
+
+
 /**
  * Create a server instance directory and generation with default parameters,
  * suitable for unit testing.
@@ -78,20 +96,6 @@ using namespace oxt;
 void createServerInstanceDirAndGeneration(ServerInstanceDirPtr &serverInstanceDir,
                                           ServerInstanceDir::GenerationPtr &generation);
 
-/**
- * Read all data from the given file until EOF.
- *
- * @throws SystemException
- */
-string readAll(const string &filename);
-
-/**
- * Read all data from the given file descriptor until EOF.
- *
- * @throws SystemException
- */
-string readAll(int fd);
-
 /**
  * Writes zeroes into the given file descriptor its buffer is full (i.e.
  * the next write will block).
@@ -100,12 +104,6 @@ string readAll(int fd);
  */
 void writeUntilFull(int fd);
 
-/**
- * Look for 'toFind' inside 'str', replace it with 'replaceWith' and return the result.
- * Only the first occurence of 'toFind' is replaced.
- */
-string replaceString(const string &str, const string &toFind, const string &replaceWith);
-
 /**
  * Look for 'toFind' inside the given file, replace it with 'replaceWith' and write
  * the result back to the file. Only the first occurence of 'toFind' is replaced.
@@ -114,6 +112,11 @@ string replaceString(const string &str, const string &toFind, const string &repl
  */
 void replaceStringInFile(const char *filename, const string &toFind, const string &replaceWith);
 
+/**
+ * Returns whether 'str' contains the given substring.
+ */
+bool containsSubstring(const StaticString &str, const StaticString &substr);
+
 /**
  * Writes the given data into the given file.
  *
@@ -152,7 +155,7 @@ private:
 public:
 	TempDir(const string &name) {
 		this->name = name;
-		if (mkdir(name.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) {
+		if (mkdir(name.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0 && errno != EEXIST) {
 			int e = errno;
 			string message = "Cannot create directory '";
 			message.append(name);
@@ -182,7 +185,19 @@ public:
 		char command[1024];
 		snprintf(command, sizeof(command), "cp -pR \"%s\" \"%s\"",
 			source.c_str(), dest.c_str());
-		system(command);
+		pid_t pid = fork();
+		if (pid == 0) {
+			resetSignalHandlersAndMask();
+			disableMallocDebugging();
+			closeAllFileDescriptors(2);
+			execlp("/bin/sh", "/bin/sh", "-c", command, (char * const) 0);
+			_exit(1);
+		} else if (pid == -1) {
+			int e = errno;
+			throw SystemException("Cannot fork()", e);
+		} else {
+			waitpid(pid, NULL, 0);
+		}
 	}
 	
 	~TempDirCopy() {
@@ -198,8 +213,11 @@ class DeleteFileEventually {
 private:
 	string filename;
 public:
-	DeleteFileEventually(const string &filename) {
+	DeleteFileEventually(const string &filename, bool deleteNow = true) {
 		this->filename = filename;
+		if (deleteNow) {
+			unlink(filename.c_str());
+		}
 	}
 	
 	~DeleteFileEventually() {
@@ -217,7 +235,7 @@ public:
 	oxt::thread thread;
 	
 	TempThread(boost::function<void ()> func)
-		: thread(func)
+		: thread(boost::bind(runAndPrintExceptions, func, true))
 		{ }
 	
 	~TempThread() {
@@ -235,6 +253,14 @@ public:
 		val = 0;
 	}
 	
+	AtomicInt(int value) {
+		val = value;
+	}
+	
+	AtomicInt(const AtomicInt &other) {
+		val = other.val;
+	}
+	
 	int get() const {
 		lock_guard<boost::mutex> l(lock);
 		return val;
@@ -250,11 +276,25 @@ public:
 		return *this;
 	}
 	
+	AtomicInt &operator++() {
+		lock_guard<boost::mutex> l(lock);
+		val++;
+		return *this;
+	}
+	
+	AtomicInt operator++(int) {
+		lock_guard<boost::mutex> l(lock);
+		AtomicInt temp(*this);
+		val++;
+		return temp;
+	}
+	
 	operator int() const {
 		return get();
 	}
 };
 
+
 } // namespace TestSupport
 
 using namespace TestSupport;

data/test/cxx/{LoggingTest.cpp → UnionStationTest.cpp}

@@ -1,7 +1,7 @@
-#include "TestSupport.h"
-#include <Logging.h>
+#include <TestSupport.h>
+#include <UnionStation.h>
 #include <MessageClient.h>
-#include <LoggingAgent/LoggingServer.h>
+#include <agents/LoggingAgent/LoggingServer.h>
 #include <Utils/MessageIO.h>
 
 #include <boost/bind.hpp>
@@ -10,11 +10,12 @@
 #include <set>
 
 using namespace Passenger;
+using namespace Passenger::UnionStation;
 using namespace std;
 using namespace oxt;
 
 namespace tut {
-	struct LoggingTest {
+	struct UnionStationTest {
 		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
@@ -36,9 +37,9 @@ namespace tut {
 		FileDescriptor serverFd;
 		LoggingServerPtr server;
 		shared_ptr<oxt::thread> serverThread;
-		AnalyticsLoggerPtr logger, logger2, logger3, logger4;
+		LoggerFactoryPtr factory, factory2, factory3, factory4;
 		
-		LoggingTest() {
+		UnionStationTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			socketFilename = generation->getPath() + "/logging.socket";
 			socketAddress = "unix:" + socketFilename;
@@ -48,17 +49,17 @@ namespace tut {
 			setLogLevel(-1);
 			
 			startLoggingServer();
-			logger = ptr(new AnalyticsLogger(socketAddress, "test", "1234",
+			factory = ptr(new LoggerFactory(socketAddress, "test", "1234",
 				"localhost"));
-			logger2 = ptr(new AnalyticsLogger(socketAddress, "test", "1234",
+			factory2 = ptr(new LoggerFactory(socketAddress, "test", "1234",
 				"localhost"));
-			logger3 = ptr(new AnalyticsLogger(socketAddress, "test", "1234",
+			factory3 = ptr(new LoggerFactory(socketAddress, "test", "1234",
 				"localhost"));
-			logger4 = ptr(new AnalyticsLogger(socketAddress, "test", "1234",
+			factory4 = ptr(new LoggerFactory(socketAddress, "test", "1234",
 				"localhost"));
 		}
 		
-		~LoggingTest() {
+		~UnionStationTest() {
 			stopLoggingServer();
 			SystemTime::releaseAll();
 			setLogLevel(0);
@@ -72,7 +73,7 @@ namespace tut {
 				initFunc();
 			}
 			serverThread = ptr(new oxt::thread(
-				boost::bind(&LoggingTest::runLoop, this)
+				boost::bind(&UnionStationTest::runLoop, this)
 			));
 		}
 		
@@ -117,7 +118,7 @@ namespace tut {
 		}
 	};
 	
-	DEFINE_TEST_GROUP(LoggingTest);
+	DEFINE_TEST_GROUP(UnionStationTest);
 	
 	
 	/*********** Logging interface tests ***********/
@@ -126,12 +127,12 @@ namespace tut {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello");
 		log->message("world");
 		log->flushToDiskAfterClose(true);
 		
-		ensure(!logger->isNull());
+		ensure(!factory->isNull());
 		ensure(!log->isNull());
 		
 		log.reset();
@@ -145,11 +146,11 @@ namespace tut {
 		// Test logging of existing transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("message 1");
 		log->flushToDiskAfterClose(true);
 		
-		AnalyticsLogPtr log2 = logger2->continueTransaction(log->getTxnId(),
+		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2->flushToDiskAfterClose(true);
@@ -165,19 +166,19 @@ namespace tut {
 	TEST_METHOD(3) {
 		// Test logging with different points in time.
 		SystemTime::forceAll(YESTERDAY);
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("message 1");
 		SystemTime::forceAll(TODAY);
 		log->message("message 2");
 		log->flushToDiskAfterClose(true);
 		
 		SystemTime::forceAll(TOMORROW);
-		AnalyticsLogPtr log2 = logger2->continueTransaction(log->getTxnId(),
+		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 3");
 		log2->flushToDiskAfterClose(true);
 		
-		AnalyticsLogPtr log3 = logger3->newTransaction("foobar");
+		LoggerPtr log3 = factory3->newTransaction("foobar");
 		log3->message("message 4");
 		log3->flushToDiskAfterClose(true);
 		
@@ -195,13 +196,13 @@ namespace tut {
 	
 	TEST_METHOD(4) {
 		// newTransaction() and continueTransaction() write an ATTACH message
-		// to the log file, while AnalyticsLogPtr writes a DETACH message upon
+		// to the log file, while Logger writes a DETACH message upon
 		// destruction.
 		SystemTime::forceAll(YESTERDAY);
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		
 		SystemTime::forceAll(TODAY);
-		AnalyticsLogPtr log2 = logger2->continueTransaction(log->getTxnId(),
+		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->flushToDiskAfterClose(true);
 		log2.reset();
@@ -220,11 +221,11 @@ namespace tut {
 	TEST_METHOD(5) {
 		// newTransaction() generates a new ID, while continueTransaction()
 		// reuses the ID.
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
-		AnalyticsLogPtr log2 = logger2->newTransaction("foobar");
-		AnalyticsLogPtr log3 = logger3->continueTransaction(log->getTxnId(),
+		LoggerPtr log = factory->newTransaction("foobar");
+		LoggerPtr log2 = factory2->newTransaction("foobar");
+		LoggerPtr log3 = factory3->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
-		AnalyticsLogPtr log4 = logger4->continueTransaction(log2->getTxnId(),
+		LoggerPtr log4 = factory4->continueTransaction(log2->getTxnId(),
 			log2->getGroupName(), log2->getCategory());
 		
 		ensure_equals(log->getTxnId(), log3->getTxnId());
@@ -233,19 +234,19 @@ namespace tut {
 	}
 	
 	TEST_METHOD(6) {
-		// An empty AnalyticsLog doesn't do anything.
-		AnalyticsLog log;
+		// An empty Logger doesn't do anything.
+		Logger log;
 		ensure(log.isNull());
 		log.message("hello world");
 		ensure_equals(getFileType(loggingDir), FT_NONEXISTANT);
 	}
 	
 	TEST_METHOD(7) {
-		// An empty AnalyticsLogger doesn't do anything.
-		AnalyticsLogger logger;
-		ensure(logger.isNull());
+		// An empty LoggerFactory doesn't do anything.
+		LoggerFactory factory;
+		ensure(factory.isNull());
 		
-		AnalyticsLogPtr log = logger.newTransaction("foo");
+		LoggerPtr log = factory.newTransaction("foo");
 		ensure(log->isNull());
 		log->message("hello world");
 		ensure_equals(getFileType(loggingDir), FT_NONEXISTANT);
@@ -253,7 +254,7 @@ namespace tut {
 	
 	TEST_METHOD(8) {
 		// It creates a file group_name.txt under the group directory.
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		string data = readAll(loggingDir + "/1/" FOOBAR_MD5 "/group_name.txt");
@@ -262,7 +263,7 @@ namespace tut {
 	
 	TEST_METHOD(9) {
 		// It creates a file node_name.txt under the node directory.
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		string data = readAll(loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/node_name.txt");
@@ -272,19 +273,19 @@ namespace tut {
 	TEST_METHOD(11) {
 		// newTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
-		logger->setReconnectTimeout(60 * 1000000);
-		logger->setMaxConnectTries(1);
+		factory->setReconnectTimeout(60 * 1000000);
+		factory->setMaxConnectTries(1);
 		
 		SystemTime::forceAll(TODAY);
 		stopLoggingServer();
-		ensure(logger->newTransaction("foobar")->isNull());
+		ensure(factory->newTransaction("foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
-		ensure(logger->newTransaction("foobar")->isNull());
+		ensure(factory->newTransaction("foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!logger->newTransaction("foobar")->isNull());
+		ensure(!factory->newTransaction("foobar")->isNull());
 	}
 	
 	TEST_METHOD(12) {
@@ -294,22 +295,23 @@ namespace tut {
 		// calls will reestablish the connection when the connection timeout
 		// has passed.
 		SystemTime::forceAll(TODAY);
-		AnalyticsLogPtr log, log2;
+		LoggerPtr log, log2;
 		
-		log = logger->newTransaction("foobar");
-		logger2->continueTransaction(log->getTxnId(), "foobar");
+		log = factory->newTransaction("foobar");
+		factory2->continueTransaction(log->getTxnId(), "foobar");
+		log.reset(); // Check connection back into the pool.
 		stopLoggingServer();
 		startLoggingServer();
-		
-		log = logger->newTransaction("foobar");
+
+		log = factory->newTransaction("foobar");
 		ensure("(1)", log->isNull());
-		log2 = logger2->continueTransaction("some-id", "foobar");
+		log2 = factory2->continueTransaction("some-id", "foobar");
 		ensure("(2)", log2->isNull());
 		
 		SystemTime::forceAll(TODAY + 60000000);
-		log = logger->newTransaction("foobar");
+		log = factory->newTransaction("foobar");
 		ensure("(3)", !log->isNull());
-		log2 = logger2->continueTransaction(log->getTxnId(), "foobar");
+		log2 = factory2->continueTransaction(log->getTxnId(), "foobar");
 		ensure("(4)", !log2->isNull());
 		log2->message("hello");
 		log2->flushToDiskAfterClose(true);
@@ -323,23 +325,23 @@ namespace tut {
 	TEST_METHOD(13) {
 		// continueTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
-		logger->setReconnectTimeout(60 * 1000000);
-		logger->setMaxConnectTries(1);
-		logger2->setReconnectTimeout(60 * 1000000);
-		logger2->setMaxConnectTries(1);
+		factory->setReconnectTimeout(60 * 1000000);
+		factory->setMaxConnectTries(1);
+		factory2->setReconnectTimeout(60 * 1000000);
+		factory2->setMaxConnectTries(1);
 		
 		SystemTime::forceAll(TODAY);
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
-		logger2->continueTransaction(log->getTxnId(), "foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
+		factory2->continueTransaction(log->getTxnId(), "foobar");
 		stopLoggingServer();
-		ensure(logger2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
-		ensure(logger2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!logger2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(!factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 	}
 	
 	TEST_METHOD(14) {
@@ -529,7 +531,7 @@ namespace tut {
 		// The server temporarily buffers data in memory.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		
@@ -546,7 +548,7 @@ namespace tut {
 		// The destructor flushes all data.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		stopLoggingServer();
@@ -561,13 +563,14 @@ namespace tut {
 		// The 'flush' command flushes all data.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		
+		ConnectionPtr connection = factory->checkoutConnection();
 		vector<string> args;
-		writeArrayMessage(logger->getConnection(), "flush", NULL);
-		ensure(readArrayMessage(logger->getConnection(), args));
+		writeArrayMessage(connection->fd, "flush", NULL);
+		ensure(readArrayMessage(connection->fd, args));
 		ensure_equals(args.size(), 1u);
 		ensure_equals(args[0], "ok");
 		
@@ -583,19 +586,21 @@ namespace tut {
 		SystemTime::forceAll(YESTERDAY);
 		vector<string> args;
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		
-		AnalyticsLogPtr log2 = logger2->continueTransaction(log->getTxnId(),
+		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2.reset();
 		
-		writeArrayMessage(logger->getConnection(), "flush", NULL);
-		ensure(readArrayMessage(logger->getConnection(), args));
+		ConnectionPtr connection = factory->checkoutConnection();
+		writeArrayMessage(connection->fd, "flush", NULL);
+		ensure(readArrayMessage(connection->fd, args));
 		
-		writeArrayMessage(logger2->getConnection(), "flush", NULL);
-		ensure(readArrayMessage(logger2->getConnection(), args));
+		connection = factory2->checkoutConnection();
+		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;
@@ -700,7 +705,7 @@ namespace tut {
 		// turned on.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		LoggerPtr log = factory->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		
@@ -713,7 +718,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(28) {
-		// AnalyticsLogger treats a server that's semi-gracefully exiting as
+		// LoggerFactory treats a server that's semi-gracefully exiting as
 		// one that's refusing connections.
 		SystemTime::forceAll(YESTERDAY);
 		
@@ -721,8 +726,8 @@ namespace tut {
 		client.write("exit", "semi-gracefully", NULL);
 		client.disconnect();
 		
-		logger->setMaxConnectTries(1);
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
+		factory->setMaxConnectTries(1);
+		LoggerPtr log = factory->newTransaction("foobar");
 		ensure(log->isNull());
 	}
 	
@@ -750,7 +755,7 @@ namespace tut {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		AnalyticsLogPtr log = logger->newTransaction("foobar", "requests", "",
+		LoggerPtr log = factory->newTransaction("foobar", "requests", "",
 			"uri == \"/foo\""
 			"\1"
 			"uri != \"/bar\"");
@@ -759,7 +764,7 @@ namespace tut {
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		
-		log = logger->newTransaction("foobar", "requests", "",
+		log = factory->newTransaction("foobar", "requests", "",
 			"uri == \"/foo\""
 			"\1"
 			"uri == \"/bar\"");