passenger 4.0.42 → 4.0.43

data/test/cxx/RequestHandlerTest.cpp

@@ -5,6 +5,7 @@
 #include <ApplicationPool2/Pool.h>
 #include <Utils/json.h>
 #include <Utils/IOUtils.h>
+#include <Utils/StrIntUtils.h>
 #include <Utils/Timer.h>
 #include <Utils/BufferedIO.h>
 
@@ -42,7 +43,7 @@ namespace tut {
 		
 		RequestHandlerTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
-			spawnerFactory = boost::make_shared<SpawnerFactory>(bg.safe, *resourceLocator, generation);
+			spawnerFactory = boost::make_shared<SpawnerFactory>(*resourceLocator, generation);
 			pool = boost::make_shared<Pool>(spawnerFactory);
 			pool->initialize();
 			serverFilename = generation->getPath() + "/server";
@@ -97,7 +98,9 @@ namespace tut {
 			return connection;
 		}
 
-		void sendHeaders(const map<string, string> &headers, ...) {
+		void sendHeaders(const map<string, string> &headers, const char *header1,
+			const char *value1, ...)
+		{
 			va_list ap;
 			const char *arg;
 			map<string, string> finalHeaders;
@@ -111,7 +114,10 @@ namespace tut {
 				finalHeaders[key] = value;
 			}
 
-			va_start(ap, headers);
+			finalHeaders[makeStaticStringWithNull(header1)] =
+				makeStaticStringWithNull(value1);
+
+			va_start(ap, value1);
 			while ((arg = va_arg(ap, const char *)) != NULL) {
 				string key(arg, strlen(arg) + 1);
 				arg = va_arg(ap, const char *);

data/test/cxx/UnionStationTest.cpp

@@ -1,5 +1,6 @@
 #include <TestSupport.h>
-#include <UnionStation.h>
+#include <UnionStation/Core.h>
+#include <UnionStation/Transaction.h>
 #include <MessageClient.h>
 #include <agents/LoggingAgent/LoggingServer.h>
 #include <Utils/MessageIO.h>
@@ -32,7 +33,7 @@ namespace tut {
 		FileDescriptor serverFd;
 		LoggingServerPtr server;
 		boost::shared_ptr<oxt::thread> serverThread;
-		LoggerFactoryPtr factory, factory2, factory3, factory4;
+		CorePtr core, core2, core3, core4;
 		
 		UnionStationTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
@@ -44,14 +45,14 @@ namespace tut {
 			setLogLevel(-1);
 			
 			startLoggingServer();
-			factory = ptr(new LoggerFactory(socketAddress, "test", "1234",
-				"localhost"));
-			factory2 = ptr(new LoggerFactory(socketAddress, "test", "1234",
-				"localhost"));
-			factory3 = ptr(new LoggerFactory(socketAddress, "test", "1234",
-				"localhost"));
-			factory4 = ptr(new LoggerFactory(socketAddress, "test", "1234",
-				"localhost"));
+			core = make_shared<Core>(socketAddress, "test", "1234",
+				"localhost");
+			core2 = make_shared<Core>(socketAddress, "test", "1234",
+				"localhost");
+			core3 = make_shared<Core>(socketAddress, "test", "1234",
+				"localhost");
+			core4 = make_shared<Core>(socketAddress, "test", "1234",
+				"localhost");
 		}
 		
 		~UnionStationTest() {
@@ -128,12 +129,12 @@ namespace tut {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello");
 		log->message("world");
 		log->flushToDiskAfterClose(true);
 		
-		ensure(!factory->isNull());
+		ensure(!core->isNull());
 		ensure(!log->isNull());
 		
 		log.reset();
@@ -147,11 +148,11 @@ namespace tut {
 		// Test logging of existing transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("message 1");
 		log->flushToDiskAfterClose(true);
 		
-		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
+		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2->flushToDiskAfterClose(true);
@@ -167,19 +168,19 @@ namespace tut {
 	TEST_METHOD(3) {
 		// Test logging with different points in time.
 		SystemTime::forceAll(YESTERDAY);
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("message 1");
 		SystemTime::forceAll(TODAY);
 		log->message("message 2");
 		log->flushToDiskAfterClose(true);
 		
 		SystemTime::forceAll(TOMORROW);
-		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
+		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 3");
 		log2->flushToDiskAfterClose(true);
 		
-		LoggerPtr log3 = factory3->newTransaction("foobar");
+		TransactionPtr log3 = core3->newTransaction("foobar");
 		log3->message("message 4");
 		log3->flushToDiskAfterClose(true);
 		
@@ -196,13 +197,13 @@ namespace tut {
 	
 	TEST_METHOD(4) {
 		// newTransaction() and continueTransaction() write an ATTACH message
-		// to the log file, while Logger writes a DETACH message upon
+		// to the log file, while UnionStation::Transaction writes a DETACH message upon
 		// destruction.
 		SystemTime::forceAll(YESTERDAY);
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		
 		SystemTime::forceAll(TODAY);
-		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
+		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->flushToDiskAfterClose(true);
 		log2.reset();
@@ -221,11 +222,11 @@ namespace tut {
 	TEST_METHOD(5) {
 		// newTransaction() generates a new ID, while continueTransaction()
 		// reuses the ID.
-		LoggerPtr log = factory->newTransaction("foobar");
-		LoggerPtr log2 = factory2->newTransaction("foobar");
-		LoggerPtr log3 = factory3->continueTransaction(log->getTxnId(),
+		TransactionPtr log = core->newTransaction("foobar");
+		TransactionPtr log2 = core2->newTransaction("foobar");
+		TransactionPtr log3 = core3->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
-		LoggerPtr log4 = factory4->continueTransaction(log2->getTxnId(),
+		TransactionPtr log4 = core4->continueTransaction(log2->getTxnId(),
 			log2->getGroupName(), log2->getCategory());
 		
 		ensure_equals(log->getTxnId(), log3->getTxnId());
@@ -234,19 +235,19 @@ namespace tut {
 	}
 	
 	TEST_METHOD(6) {
-		// An empty Logger doesn't do anything.
-		Logger log;
+		// An empty UnionStation::Transaction doesn't do anything.
+		UnionStation::Transaction log;
 		ensure(log.isNull());
 		log.message("hello world");
 		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
 	}
 	
 	TEST_METHOD(7) {
-		// An empty LoggerFactory doesn't do anything.
-		LoggerFactory factory;
-		ensure(factory.isNull());
+		// An empty UnionStation::Core doesn't do anything.
+		UnionStation::Core core;
+		ensure(core.isNull());
 		
-		LoggerPtr log = factory.newTransaction("foo");
+		TransactionPtr log = core.newTransaction("foo");
 		ensure(log->isNull());
 		log->message("hello world");
 		ensure_equals(getFileType(dumpFile), FT_NONEXISTANT);
@@ -255,19 +256,18 @@ namespace tut {
 	TEST_METHOD(11) {
 		// newTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
-		factory->setReconnectTimeout(60 * 1000000);
-		factory->setMaxConnectTries(1);
+		core->setReconnectTimeout(60 * 1000000);
 		
 		SystemTime::forceAll(TODAY);
 		stopLoggingServer();
-		ensure(factory->newTransaction("foobar")->isNull());
+		ensure(core->newTransaction("foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
-		ensure(factory->newTransaction("foobar")->isNull());
+		ensure(core->newTransaction("foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!factory->newTransaction("foobar")->isNull());
+		ensure(!core->newTransaction("foobar")->isNull());
 	}
 	
 	TEST_METHOD(12) {
@@ -277,23 +277,23 @@ namespace tut {
 		// calls will reestablish the connection when the connection timeout
 		// has passed.
 		SystemTime::forceAll(TODAY);
-		LoggerPtr log, log2;
+		TransactionPtr log, log2;
 		
-		log = factory->newTransaction("foobar");
-		factory2->continueTransaction(log->getTxnId(), "foobar");
+		log = core->newTransaction("foobar");
+		core2->continueTransaction(log->getTxnId(), "foobar");
 		log.reset(); // Check connection back into the pool.
 		stopLoggingServer();
 		startLoggingServer();
 
-		log = factory->newTransaction("foobar");
+		log = core->newTransaction("foobar");
 		ensure("(1)", log->isNull());
-		log2 = factory2->continueTransaction("some-id", "foobar");
+		log2 = core2->continueTransaction("some-id", "foobar");
 		ensure("(2)", log2->isNull());
 		
 		SystemTime::forceAll(TODAY + 60000000);
-		log = factory->newTransaction("foobar");
+		log = core->newTransaction("foobar");
 		ensure("(3)", !log->isNull());
-		log2 = factory2->continueTransaction(log->getTxnId(), "foobar");
+		log2 = core2->continueTransaction(log->getTxnId(), "foobar");
 		ensure("(4)", !log2->isNull());
 		log2->message("hello");
 		log2->flushToDiskAfterClose(true);
@@ -308,23 +308,21 @@ namespace tut {
 	TEST_METHOD(13) {
 		// continueTransaction() does not reconnect to the server for a short
 		// period of time if connecting failed
-		factory->setReconnectTimeout(60 * 1000000);
-		factory->setMaxConnectTries(1);
-		factory2->setReconnectTimeout(60 * 1000000);
-		factory2->setMaxConnectTries(1);
+		core->setReconnectTimeout(60 * 1000000);
+		core2->setReconnectTimeout(60 * 1000000);
 		
 		SystemTime::forceAll(TODAY);
-		LoggerPtr log = factory->newTransaction("foobar");
-		factory2->continueTransaction(log->getTxnId(), "foobar");
+		TransactionPtr log = core->newTransaction("foobar");
+		core2->continueTransaction(log->getTxnId(), "foobar");
 		stopLoggingServer();
-		ensure(factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 30 * 1000000);
 		startLoggingServer();
-		ensure(factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 		
 		SystemTime::forceAll(TODAY + 61 * 1000000);
-		ensure(!factory2->continueTransaction(log->getTxnId(), "foobar")->isNull());
+		ensure(!core2->continueTransaction(log->getTxnId(), "foobar")->isNull());
 	}
 	
 	TEST_METHOD(14) {
@@ -515,7 +513,7 @@ namespace tut {
 	
 	TEST_METHOD(22) {
 		// The destructor flushes all data.
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		stopLoggingServer();
@@ -529,11 +527,11 @@ namespace tut {
 		// The 'flush' command flushes all data.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		
-		ConnectionPtr connection = factory->checkoutConnection();
+		ConnectionPtr connection = core->checkoutConnection();
 		vector<string> args;
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
@@ -551,19 +549,19 @@ namespace tut {
 		SystemTime::forceAll(YESTERDAY);
 		vector<string> args;
 		
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		
-		LoggerPtr log2 = factory2->continueTransaction(log->getTxnId(),
+		TransactionPtr log2 = core2->continueTransaction(log->getTxnId(),
 			log->getGroupName(), log->getCategory());
 		log2->message("message 2");
 		log2.reset();
 		
-		ConnectionPtr connection = factory->checkoutConnection();
+		ConnectionPtr connection = core->checkoutConnection();
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
 		
-		connection = factory2->checkoutConnection();
+		connection = core2->checkoutConnection();
 		writeArrayMessage(connection->fd, "flush", NULL);
 		ensure(readArrayMessage(connection->fd, args));
 		
@@ -669,7 +667,7 @@ namespace tut {
 		// turned on.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		log->message("hello world");
 		log.reset();
 		
@@ -682,7 +680,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(28) {
-		// LoggerFactory treats a server that's semi-gracefully exiting as
+		// UnionStation::Core treats a server that's semi-gracefully exiting as
 		// one that's refusing connections.
 		SystemTime::forceAll(YESTERDAY);
 		
@@ -690,8 +688,7 @@ namespace tut {
 		client.write("exit", "semi-gracefully", NULL);
 		client.disconnect();
 		
-		factory->setMaxConnectTries(1);
-		LoggerPtr log = factory->newTransaction("foobar");
+		TransactionPtr log = core->newTransaction("foobar");
 		ensure(log->isNull());
 	}
 	
@@ -718,7 +715,7 @@ namespace tut {
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);
 		
-		LoggerPtr log = factory->newTransaction("foobar", "requests", "-",
+		TransactionPtr log = core->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
 			"uri != \"/bar\"");
@@ -727,7 +724,7 @@ namespace tut {
 		log->flushToDiskAfterClose(true);
 		log.reset();
 		
-		log = factory->newTransaction("foobar", "requests", "-",
+		log = core->newTransaction("foobar", "requests", "-",
 			"uri == \"/foo\""
 			"\1"
 			"uri == \"/bar\"");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.42
+  version: 4.0.43
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +132,7 @@ files:
 - doc/Architectural overview.html
 - doc/Architectural overview.idmap.txt
 - doc/Architectural overview.txt
+- doc/CodingTipsAndPitfalls.md
 - doc/DebuggingAndStressTesting.md
 - doc/Packaging.html
 - doc/Packaging.txt.md
@@ -2168,7 +2169,10 @@ files:
 - ext/common/SafeLibev.h
 - ext/common/ServerInstanceDir.h
 - ext/common/StaticString.h
-- ext/common/UnionStation.h
+- ext/common/UnionStation/Connection.h
+- ext/common/UnionStation/Core.h
+- ext/common/UnionStation/ScopeLog.h
+- ext/common/UnionStation/Transaction.h
 - ext/common/Utils.cpp
 - ext/common/Utils.h
 - ext/common/Utils/AnsiColorConstants.h
@@ -2205,10 +2209,13 @@ files:
 - ext/common/Utils/ProcessMetricsCollector.h
 - ext/common/Utils/ScopeGuard.h
 - ext/common/Utils/SmallVector.h
+- ext/common/Utils/SpeedMeter.h
 - ext/common/Utils/StrIntUtils.cpp
 - ext/common/Utils/StrIntUtils.h
 - ext/common/Utils/StreamBoyerMooreHorspool.h
 - ext/common/Utils/StringMap.h
+- ext/common/Utils/StringScanning.h
+- ext/common/Utils/SystemMetricsCollector.h
 - ext/common/Utils/SystemTime.cpp
 - ext/common/Utils/SystemTime.h
 - ext/common/Utils/Template.h
@@ -2233,6 +2240,7 @@ files:
 - ext/common/agents/HelperAgent/RequestHandler.cpp
 - ext/common/agents/HelperAgent/RequestHandler.h
 - ext/common/agents/HelperAgent/ScgiRequestParser.h
+- ext/common/agents/HelperAgent/SystemMetricsTool.cpp
 - ext/common/agents/LoggingAgent/AdminController.h
 - ext/common/agents/LoggingAgent/DataStoreId.h
 - ext/common/agents/LoggingAgent/FilterSupport.cpp
@@ -2348,7 +2356,6 @@ files:
 - helper-scripts/prespawn
 - helper-scripts/rack-loader.rb
 - helper-scripts/rack-preloader.rb
-- helper-scripts/system-memory-stats.py
 - helper-scripts/wsgi-loader.py
 - helper-scripts/wsgi-preloader.py
 - lib/phusion_passenger.rb
@@ -2366,8 +2373,10 @@ files:
 - lib/phusion_passenger/config/build_native_support_command.rb
 - lib/phusion_passenger/config/command.rb
 - lib/phusion_passenger/config/detach_process_command.rb
+- lib/phusion_passenger/config/list_instances_command.rb
 - lib/phusion_passenger/config/main.rb
 - lib/phusion_passenger/config/restart_app_command.rb
+- lib/phusion_passenger/config/system_metrics_command.rb
 - lib/phusion_passenger/config/utils.rb
 - lib/phusion_passenger/config/validate_install_command.rb
 - lib/phusion_passenger/console_text_template.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqMD6cH+wWb6/mBkguwed9UWsjY+LC8
-42sUBsesd5hlxmVqjFN0jHxuPEE8tpcZSVBTrL3ZUZ1Ie05Eqen7Hv4MwkJvsPxz
-lUABjMsO8pWsK7Gy+epXYGsfzY47Tgeyc2VaXZsx5BlRRxzTQrnH3vKyPSaRKc12
-GxZs3I8up/rKek/R+WAkQdiVIu4ciQ7VSRET4QHYzNU4oCAgecSgh8SqXPUbqcHU
-lt0wSGudNa5o6NrIAkiRJ28mITiEfKHuuDdBV7OuGSeOT6tjSINL3UbANPb81O3x
-hOLafWUnPmfTgXCv3SFycp7mdIwTOROnx4c/kQfPXXln02TlCYjzkFVHFHG2Lrw=
-=fwu8
+iQEcBAABAgAGBQJThfVVAAoJECrHRaUKISqMxm4H/1VmXIAwP/ui3DZ77GF/lFD7
+Sx+4+kvHyWV7omZyqypxZ6v6rCtXLHb7iVeGq2nHYpPq1677XyPLMDWUUxWQ+4iX
+Duvlm1f0BWIAiNtVjT0qAGnvaEWHfY94AHgPNXrDm4uZVWgdc03C3WgSU9C+w9et
+49uT+AjSzDOTjlSvtUJIxXXRUAdaB+Rk2Jv+OeN6ppfRLDJrtrue1MbVsJsACdTr
+OZf0knUKURk6cPW8Kt09dvzM3U3qj+mXc4r6jPF6dbSK4xr9H8ZaqBiW1YSygEwM
+lwn4z09wODlcJdNo0l4JeeygYyNSmKv259shnMMt0oAf89892ZEJSCEnODxIjGM=
+=hyO5
 -----END PGP SIGNATURE-----