passenger 4.0.60 → 5.0.0.beta1

data/test/cxx/TestSupport.h

@@ -19,7 +19,7 @@
 
 #include "../tut/tut.h"
 #include <ResourceLocator.h>
-#include <ServerInstanceDir.h>
+#include <InstanceDirectory.h>
 #include <BackgroundEventLoop.h>
 #include <Exceptions.h>
 #include <Utils.h>
@@ -101,11 +101,12 @@ extern Json::Value testConfig;
 
 
 /**
- * Create a server instance directory and generation with default parameters,
- * suitable for unit testing.
+ * Create an instance directory with default parameters, suitable for unit testing.
  */
-void createServerInstanceDirAndGeneration(ServerInstanceDirPtr &serverInstanceDir,
-                                          ServerInstanceDir::GenerationPtr &generation);
+void createInstanceDir(InstanceDirectoryPtr &instanceDir);
+
+void initializeLibeio();
+void shutdownLibeio();
 
 /**
  * Writes zeroes into the given file descriptor its buffer is full (i.e.
@@ -176,7 +177,7 @@ public:
 		}
 		ignoreRemoveErrors = _ignoreRemoveErrors;
 	}
-	
+
 	~TempDir() {
 		if (ignoreRemoveErrors) {
 			try {
@@ -202,7 +203,7 @@ public:
 	TempDirCopy(const string &source, const string &dest) {
 		dir = dest;
 		removeDirTree(dest);
-		
+
 		char command[1024];
 		snprintf(command, sizeof(command), "cp -pR \"%s\" \"%s\"",
 			source.c_str(), dest.c_str());
@@ -220,7 +221,7 @@ public:
 			waitpid(pid, NULL, 0);
 		}
 	}
-	
+
 	~TempDirCopy() {
 		removeDirTree(dir);
 	}
@@ -240,7 +241,7 @@ public:
 			unlink(filename.c_str());
 		}
 	}
-	
+
 	~DeleteFileEventually() {
 		unlink(filename.c_str());
 	}
@@ -254,13 +255,22 @@ public:
 class TempThread {
 public:
 	oxt::thread thread;
-	
+	bool joined;
+
 	TempThread(boost::function<void ()> func)
-		: thread(boost::bind(runAndPrintExceptions, func, true))
+		: thread(boost::bind(runAndPrintExceptions, func, true)),
+		  joined(false)
 		{ }
-	
+
 	~TempThread() {
-		thread.interrupt_and_join();
+		if (!joined) {
+			thread.interrupt_and_join();
+		}
+	}
+
+	void join() {
+		thread.join();
+		joined = true;
 	}
 };
 
@@ -273,43 +283,43 @@ public:
 	AtomicInt() {
 		val = 0;
 	}
-	
+
 	AtomicInt(int value) {
 		val = value;
 	}
-	
+
 	AtomicInt(const AtomicInt &other) {
 		val = other.val;
 	}
-	
+
 	int get() const {
 		boost::lock_guard<boost::mutex> l(lock);
 		return val;
 	}
-	
+
 	void set(int value) {
 		boost::lock_guard<boost::mutex> l(lock);
 		val = value;
 	}
-	
+
 	AtomicInt &operator=(int value) {
 		set(value);
 		return *this;
 	}
-	
+
 	AtomicInt &operator++() {
 		boost::lock_guard<boost::mutex> l(lock);
 		val++;
 		return *this;
 	}
-	
+
 	AtomicInt operator++(int) {
 		boost::lock_guard<boost::mutex> l(lock);
 		AtomicInt temp(*this);
 		val++;
 		return temp;
 	}
-	
+
 	operator int() const {
 		return get();
 	}

data/test/cxx/UnionStationTest.cpp

@@ -22,9 +22,8 @@ namespace tut {
 		static const unsigned long long TOMORROW  = 1263471822000000ull;  // January 14, 2009, 12:23:42 UTC
 		#define TODAY_TXN_ID "cjb8n-abcd"
 		#define TODAY_TIMESTAMP_STR "cftz90m3k0"
-		
-		ServerInstanceDirPtr serverInstanceDir;
-		ServerInstanceDir::GenerationPtr generation;
+
+		InstanceDirectoryPtr instanceDir;
 		string socketFilename;
 		string socketAddress;
 		string dumpFile;
@@ -34,16 +33,16 @@ namespace tut {
 		LoggingServerPtr server;
 		boost::shared_ptr<oxt::thread> serverThread;
 		CorePtr core, core2, core3, core4;
-		
+
 		UnionStationTest() {
-			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
-			socketFilename = generation->getPath() + "/logging.socket";
+			createInstanceDir(instanceDir);
+			socketFilename = instanceDir->getPath() + "/logging.socket";
 			socketAddress = "unix:" + socketFilename;
-			dumpFile = generation->getPath() + "/log.txt";
+			dumpFile = instanceDir->getPath() + "/log.txt";
 			accountsDatabase = ptr(new AccountsDatabase());
 			accountsDatabase->add("test", "1234", false);
-			setLogLevel(-1);
-			
+			setLogLevel(LVL_ERROR);
+
 			startLoggingServer();
 			core = make_shared<Core>(socketAddress, "test", "1234",
 				"localhost");
@@ -54,13 +53,13 @@ namespace tut {
 			core4 = make_shared<Core>(socketAddress, "test", "1234",
 				"localhost");
 		}
-		
+
 		~UnionStationTest() {
 			stopLoggingServer();
 			SystemTime::releaseAll();
-			setLogLevel(0);
+			setLogLevel(DEFAULT_LOG_LEVEL);
 		}
-		
+
 		void startLoggingServer(const boost::function<void ()> &initFunc = boost::function<void ()>()) {
 			VariantMap options;
 			options.set("analytics_dump_file", dumpFile);
@@ -74,7 +73,7 @@ namespace tut {
 				boost::bind(&UnionStationTest::runLoop, this)
 			));
 		}
-		
+
 		void stopLoggingServer(bool destroy = true) {
 			if (serverThread != NULL) {
 				MessageClient client;
@@ -83,7 +82,7 @@ namespace tut {
 				joinLoggingServer(destroy);
 			}
 		}
-		
+
 		void joinLoggingServer(bool destroy = true) {
 			serverThread->join();
 			serverThread.reset();
@@ -92,18 +91,18 @@ namespace tut {
 			}
 			unlink(socketFilename.c_str());
 		}
-		
+
 		void runLoop() {
 			eventLoop.loop();
 			serverFd.close();
 		}
-		
+
 		string timestampString(unsigned long long timestamp) {
 			char str[2 * sizeof(unsigned long long) + 1];
 			integerToHexatri<unsigned long long>(timestamp, str);
 			return str;
 		}
-		
+
 		MessageClient createConnection(bool sendInitCommand = true) {
 			MessageClient client;
 			vector<string> args;
@@ -119,52 +118,52 @@ namespace tut {
 			return readAll(dumpFile);
 		}
 	};
-	
+
 	DEFINE_TEST_GROUP(UnionStationTest);
-	
-	
+
+
 	/*********** Logging interface tests ***********/
-	
+
 	TEST_METHOD(1) {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello");
 		log->message("world");
 		log->flushToDiskAfterClose(true);
-		
+
 		ensure(!core->isNull());
 		ensure(!log->isNull());
-		
+
 		log.reset();
-		
+
 		string data = readDumpFile();
 		ensure(data.find("hello\n") != string::npos);
 		ensure(data.find("world\n") != string::npos);
 	}
-	
+
 	TEST_METHOD(2) {
 		// Test logging of existing transaction.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("message 1");
 		log->flushToDiskAfterClose(true);
-		
+
 		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2->flushToDiskAfterClose(true);
-		
+
 		log.reset();
 		log2.reset();
-		
+
 		string data = readDumpFile();
 		ensure("(1)", data.find("message 1\n") != string::npos);
 		ensure("(2)", data.find("message 2\n") != string::npos);
 	}
-	
+
 	TEST_METHOD(3) {
 		// Test logging with different points in time.
 		SystemTime::forceAll(YESTERDAY);
@@ -173,52 +172,52 @@ namespace tut {
 		SystemTime::forceAll(TODAY);
 		log->message("message 2");
 		log->flushToDiskAfterClose(true);
-		
+
 		SystemTime::forceAll(TOMORROW);
 		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 3");
 		log2->flushToDiskAfterClose(true);
-		
+
 		TransactionPtr log3 = core3->newTransaction("foobar");
 		log3->message("message 4");
 		log3->flushToDiskAfterClose(true);
-		
+
 		log.reset();
 		log2.reset();
 		log3.reset();
-		
+
 		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) {
 		// newTransaction() and continueTransaction() write an ATTACH message
 		// to the log file, while UnionStation::Transaction writes a DETACH message upon
 		// destruction.
 		SystemTime::forceAll(YESTERDAY);
 		TransactionPtr log = core->newTransaction("foobar");
-		
+
 		SystemTime::forceAll(TODAY);
 		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->flushToDiskAfterClose(true);
 		log2.reset();
-		
+
 		SystemTime::forceAll(TOMORROW);
 		log->flushToDiskAfterClose(true);
 		log.reset();
-		
+
 		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);
 		ensure("(4)", data.find(timestampString(TOMORROW) + " 3 DETACH\n") != string::npos);
 	}
-	
+
 	TEST_METHOD(5) {
 		// newTransaction() generates a new ID, while continueTransaction()
 		// reuses the ID.
@@ -228,12 +227,12 @@ namespace tut {
 			log->getGroupName(), log->getCategory());
 		TransactionPtr log4 = core4->continueTransaction(log2->getTxnId(),
 			log2->getGroupName(), log2->getCategory());
-		
+
 		ensure_equals(log->getTxnId(), log3->getTxnId());
 		ensure_equals(log2->getTxnId(), log4->getTxnId());
 		ensure(log->getTxnId() != log2->getTxnId());
 	}
-	
+
 	TEST_METHOD(6) {
 		// An empty UnionStation::Transaction doesn't do anything.
 		UnionStation::Transaction log;
@@ -241,35 +240,35 @@ namespace tut {
 		log.message("hello world");
 		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
 	}
-	
+
 	TEST_METHOD(7) {
 		// An empty UnionStation::Core doesn't do anything.
 		UnionStation::Core core;
 		ensure(core.isNull());
-		
+
 		TransactionPtr log = core.newTransaction("foo");
 		ensure(log->isNull());
 		log->message("hello world");
 		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
 	}
-	
+
 	TEST_METHOD(11) {
 		// newTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
 		core->setReconnectTimeout(60 * 1000000);
-		
+
 		SystemTime::forceAll(TODAY);
 		stopLoggingServer();
 		ensure(core->newTransaction("foobar")->isNull());
-		
+
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
 		ensure(core->newTransaction("foobar")->isNull());
-		
+
 		SystemTime::forceAll(TODAY + 61 * 1000000);
 		ensure(!core->newTransaction("foobar")->isNull());
 	}
-	
+
 	TEST_METHOD(12) {
 		// If the logging server crashed and was restarted then
 		// newTransaction() and continueTransaction() print a warning and return
@@ -278,7 +277,7 @@ namespace tut {
 		// has passed.
 		SystemTime::forceAll(TODAY);
 		TransactionPtr log, log2;
-		
+
 		log = core->newTransaction("foobar");
 		core2->continueTransaction(log->getTxnId(), "foobar");
 		log.reset(); // Check connection back into the pool.
@@ -289,7 +288,7 @@ namespace tut {
 		ensure("(1)", log->isNull());
 		log2 = core2->continueTransaction("some-id", "foobar");
 		ensure("(2)", log2->isNull());
-		
+
 		SystemTime::forceAll(TODAY + 60000000);
 		log = core->newTransaction("foobar");
 		ensure("(3)", !log->isNull());
@@ -299,32 +298,32 @@ namespace tut {
 		log2->flushToDiskAfterClose(true);
 		log.reset();
 		log2.reset();
-		
+
 		EVENTUALLY(3,
 			result = readDumpFile().find("hello\n") != string::npos;
 		);
 	}
-	
+
 	TEST_METHOD(13) {
 		// continueTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
 		core->setReconnectTimeout(60 * 1000000);
 		core2->setReconnectTimeout(60 * 1000000);
-		
+
 		SystemTime::forceAll(TODAY);
 		TransactionPtr log = core->newTransaction("foobar");
 		core2->continueTransaction(log->getTxnId(), "foobar");
 		stopLoggingServer();
 		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
-		
+
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
 		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
-		
+
 		SystemTime::forceAll(TODAY + 61 * 1000000);
 		ensure(!core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 	}
-	
+
 	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
@@ -333,9 +332,9 @@ namespace tut {
 		MessageClient client2 = createConnection();
 		MessageClient client3 = createConnection();
 		vector<string> args;
-		
+
 		SystemTime::forceAll(TODAY);
-		
+
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"-", "true", "true", NULL);
@@ -360,7 +359,7 @@ namespace tut {
 			result = readDumpFile().find("hello world") != string::npos;
 		);
 	}
-	
+
 	TEST_METHOD(15) {
 		// If a client disconnects from the logging server then all its
 		// transactions that are no longer referenced and don't have crash
@@ -369,9 +368,9 @@ namespace tut {
 		MessageClient client2 = createConnection();
 		MessageClient client3 = createConnection();
 		vector<string> args;
-		
+
 		SystemTime::forceAll(TODAY);
-		
+
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"-", "false", "true", NULL);
@@ -389,16 +388,16 @@ namespace tut {
 			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
-	
+
 	TEST_METHOD(16) {
 		// Upon server shutdown, all transaction that have crash protection enabled
 		// will be closed and written to to the sink.
 		MessageClient client1 = createConnection();
 		MessageClient client2 = createConnection();
 		vector<string> args;
-		
+
 		SystemTime::forceAll(TODAY);
-		
+
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"-", "true", "true", NULL);
@@ -408,22 +407,22 @@ namespace tut {
 			"-", "true", NULL);
 		client2.write("flush", NULL);
 		client2.read(args);
-		
+
 		stopLoggingServer();
 		EVENTUALLY(5,
 			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
-	
+
 	TEST_METHOD(17) {
 		// Upon server shutdown, all transaction that don't have crash protection
 		// enabled will be discarded.
 		MessageClient client1 = createConnection();
 		MessageClient client2 = createConnection();
 		vector<string> args;
-		
+
 		SystemTime::forceAll(TODAY);
-		
+
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "", "requests", TODAY_TIMESTAMP_STR,
 			"-", "false", "true", NULL);
@@ -433,13 +432,13 @@ namespace tut {
 			"-", "false", NULL);
 		client2.write("flush", NULL);
 		client2.read(args);
-		
+
 		stopLoggingServer();
 		SHOULD_NEVER_HAPPEN(200,
 			result = fileExists(dumpFile) && !readDumpFile().empty();
 		);
 	}
-	
+
 	TEST_METHOD(18) {
 		// Test DataStoreId
 		{
@@ -472,7 +471,7 @@ namespace tut {
 			ensure_equals(id2.getGroupName(), "ab");
 			ensure_equals(id2.getNodeName(), "cd");
 			ensure_equals(id2.getCategory(), "ef");
-			
+
 			DataStoreId id3("gh", "ij", "kl");
 			id3 = id;
 			ensure_equals(id3.getGroupName(), "ab");
@@ -483,19 +482,19 @@ namespace tut {
 			// < operator
 			DataStoreId id, id2;
 			ensure(!(id < id2));
-			
+
 			id = DataStoreId("ab", "cd", "ef");
 			id2 = DataStoreId("ab", "cd", "ef");
 			ensure(!(id < id2));
-			
+
 			id = DataStoreId("ab", "cd", "ef");
 			id2 = DataStoreId("bb", "cd", "ef");
 			ensure(id < id2);
-			
+
 			id = DataStoreId("ab", "cd", "ef");
 			id2 = DataStoreId();
 			ensure(id2 < id);
-			
+
 			id = DataStoreId();
 			id2 = DataStoreId("ab", "cd", "ef");
 			ensure(id < id2);
@@ -510,75 +509,75 @@ namespace tut {
 			ensure(!(DataStoreId("ab", "cd", "ef") == DataStoreId("a", "cd", "ef")));
 		}
 	}
-	
+
 	TEST_METHOD(22) {
 		// The destructor flushes all data.
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		stopLoggingServer();
-		
+
 		struct stat buf;
 		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure(buf.st_size > 0);
 	}
-	
+
 	TEST_METHOD(23) {
 		// The 'flush' command flushes all data.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
-		
+
 		ConnectionPtr connection = core->checkoutConnection();
 		vector<string> args;
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
 		ensure_equals(args.size(), 1u);
 		ensure_equals(args[0], "ok");
-		
+
 		struct stat buf;
 		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure(buf.st_size > 0);
 	}
-	
+
 	TEST_METHOD(24) {
 		// A transaction's data is not written out by the server
 		// until the transaction is fully closed.
 		SystemTime::forceAll(YESTERDAY);
 		vector<string> args;
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
-		
+
 		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2.reset();
-		
+
 		ConnectionPtr connection = core->checkoutConnection();
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
-		
+
 		connection = core2->checkoutConnection();
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
-		
+
 		struct stat buf;
 		ensure_equals(stat(dumpFile.c_str(), &buf), 0);
 		ensure_equals(buf.st_size, (off_t) 0);
 	}
-	
+
 	TEST_METHOD(25) {
 		// The 'exit' command causes the logging server to exit some time after
 		// the last client has disconnected. New clients are still accepted
 		// as long as the server hasn't exited.
 		SystemTime::forceAll(YESTERDAY);
 		vector<string> args;
-		
+
 		MessageClient client = createConnection();
-		
+
 		MessageClient client2 = createConnection();
 		client2.write("exit", NULL);
 		ensure("(1)", client2.read(args));
@@ -588,17 +587,17 @@ namespace tut {
 		ensure_equals(args.size(), 1u);
 		ensure_equals(args[0], "exit command received");
 		client2.disconnect();
-		
+
 		// Not exited yet: there is still a client.
 		client2 = createConnection();
 		client2.write("ping", NULL);
 		ensure("(3)", client2.read(args));
 		client2.disconnect();
-		
+
 		client.disconnect();
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		usleep(25000); // Give server some time to process the connection closes.
-		
+
 		// No clients now, but we can still connect because the timeout
 		// hasn't passed yet.
 		SystemTime::forceAll(YESTERDAY + 1000000);
@@ -610,9 +609,9 @@ namespace tut {
 				result = true;
 			}
 		);
-		
+
 		usleep(50000); // Give server some time to process the connection closes.
-		
+
 		// It'll be gone in a few seconds.
 		SystemTime::forceAll(YESTERDAY + 1000000 + 5000000);
 		usleep(100000); // Give server some time to run the timer.
@@ -622,31 +621,31 @@ namespace tut {
 		} catch (const SystemException &) {
 			// Success
 		}
-		
+
 		joinLoggingServer();
 	}
-	
+
 	TEST_METHOD(26) {
 		// The 'exit semi-gracefully' command causes the logging server to
 		// refuse new clients while exiting some time after the last client has
 		// disconnected.
 		SystemTime::forceAll(YESTERDAY);
 		vector<string> args;
-		
+
 		MessageClient client = createConnection();
-		
+
 		MessageClient client2 = createConnection();
 		client2.write("exit", "semi-gracefully", NULL);
 		client2.disconnect();
-		
+
 		// New connections are refused.
 		client2 = createConnection();
 		ensure("(1)", !client2.read(args));
-		
+
 		client.disconnect();
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		usleep(50000); // Give server some time to process the connection closes.
-		
+
 		// It'll be gone in a few seconds.
 		SystemTime::forceAll(YESTERDAY + 1000000 + 5000000);
 		usleep(100000); // Give server some time to run the timer.
@@ -656,49 +655,49 @@ namespace tut {
 		} catch (const SystemException &) {
 			// Success
 		}
-		
+
 		joinLoggingServer();
 	}
-	
+
 	TEST_METHOD(27) {
 		// The 'exit immediately' command causes the logging server to
 		// immediately exit. Open transactions are not automatically
 		// closed and written out, even those with crash protection
 		// turned on.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
-		
+
 		MessageClient client = createConnection();
 		client.write("exit", "immediately", NULL);
 		client.disconnect();
-		
+
 		// Assertion: the following doesn't block.
 		joinLoggingServer();
 	}
-	
+
 	TEST_METHOD(28) {
 		// UnionStation::Core treats a server that's semi-gracefully exiting as
 		// one that's refusing connections.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		MessageClient client = createConnection();
 		client.write("exit", "semi-gracefully", NULL);
 		client.disconnect();
-		
+
 		TransactionPtr log = core->newTransaction("foobar");
 		ensure(log->isNull());
 	}
-	
+
 	TEST_METHOD(29) {
 		// One can supply a custom node name per openTransaction command.
 		MessageClient client1 = createConnection();
 		vector<string> args;
-		
+
 		SystemTime::forceAll(TODAY);
-		
+
 		client1.write("openTransaction",
 			TODAY_TXN_ID, "foobar", "remote", "requests", TODAY_TIMESTAMP_STR,
 			"-", "true", NULL);
@@ -706,15 +705,15 @@ namespace tut {
 		client1.write("flush", NULL);
 		client1.read(args);
 		client1.disconnect();
-		
+
 		ensure(fileExists(dumpFile));
 	}
-	
+
 	TEST_METHOD(30) {
 		// A transaction is only written to the sink if it passes all given filters.
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
-		
+
 		TransactionPtr log = core->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
@@ -723,7 +722,7 @@ namespace tut {
 		log->message("transaction 1");
 		log->flushToDiskAfterClose(true);
 		log.reset();
-		
+
 		log = core->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
@@ -732,11 +731,11 @@ namespace tut {
 		log->message("transaction 2");
 		log->flushToDiskAfterClose(true);
 		log.reset();
-		
+
 		string data = readDumpFile();
 		ensure("(1)", data.find("transaction 1\n") != string::npos);
 		ensure("(2)", data.find("transaction 2\n") == string::npos);
 	}
-	
+
 	/************************************/
 }