passenger 4.0.48 → 4.0.49

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -30,6 +30,8 @@
 #include <limits.h>
 #include <unistd.h>
 #include <boost/make_shared.hpp>
+#include <boost/ref.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <oxt/backtrace.hpp>
 #include <ApplicationPool2/Pool.h>
@@ -38,6 +40,7 @@
 #include <ApplicationPool2/PipeWatcher.h>
 #include <ApplicationPool2/ErrorRenderer.h>
 #include <Exceptions.h>
+#include <Hooks.h>
 #include <MessageReadersWriters.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
@@ -65,28 +68,28 @@ copyException(const tracable_exception &e) {
 	TRY_COPY_EXCEPTION(FileSystemException);
 	TRY_COPY_EXCEPTION(TimeRetrievalException);
 	TRY_COPY_EXCEPTION(SystemException);
-	
+
 	TRY_COPY_EXCEPTION(FileNotFoundException);
 	TRY_COPY_EXCEPTION(EOFException);
 	TRY_COPY_EXCEPTION(IOException);
-	
+
 	TRY_COPY_EXCEPTION(ConfigurationException);
-	
+
 	TRY_COPY_EXCEPTION(RequestQueueFullException);
 	TRY_COPY_EXCEPTION(GetAbortedException);
 	TRY_COPY_EXCEPTION(SpawnException);
-	
+
 	TRY_COPY_EXCEPTION(InvalidModeStringException);
 	TRY_COPY_EXCEPTION(ArgumentException);
-	
+
 	TRY_COPY_EXCEPTION(RuntimeException);
-	
+
 	TRY_COPY_EXCEPTION(TimeoutException);
-	
+
 	TRY_COPY_EXCEPTION(NonExistentUserException);
 	TRY_COPY_EXCEPTION(NonExistentGroupException);
 	TRY_COPY_EXCEPTION(SecurityException);
-	
+
 	TRY_COPY_EXCEPTION(SyntaxError);
 
 	TRY_COPY_EXCEPTION(boost::thread_interrupted);
@@ -107,28 +110,28 @@ rethrowException(const ExceptionPtr &e) {
 	TRY_RETHROW_EXCEPTION(FileSystemException);
 	TRY_RETHROW_EXCEPTION(TimeRetrievalException);
 	TRY_RETHROW_EXCEPTION(SystemException);
-	
+
 	TRY_RETHROW_EXCEPTION(FileNotFoundException);
 	TRY_RETHROW_EXCEPTION(EOFException);
 	TRY_RETHROW_EXCEPTION(IOException);
-	
+
 	TRY_RETHROW_EXCEPTION(ConfigurationException);
-	
+
 	TRY_RETHROW_EXCEPTION(SpawnException);
 	TRY_RETHROW_EXCEPTION(RequestQueueFullException);
 	TRY_RETHROW_EXCEPTION(GetAbortedException);
-	
+
 	TRY_RETHROW_EXCEPTION(InvalidModeStringException);
 	TRY_RETHROW_EXCEPTION(ArgumentException);
-	
+
 	TRY_RETHROW_EXCEPTION(RuntimeException);
-	
+
 	TRY_RETHROW_EXCEPTION(TimeoutException);
-	
+
 	TRY_RETHROW_EXCEPTION(NonExistentUserException);
 	TRY_RETHROW_EXCEPTION(NonExistentGroupException);
 	TRY_RETHROW_EXCEPTION(SecurityException);
-	
+
 	TRY_RETHROW_EXCEPTION(SyntaxError);
 
 	TRY_RETHROW_EXCEPTION(boost::lock_error);
@@ -140,7 +143,7 @@ rethrowException(const ExceptionPtr &e) {
 	TRY_RETHROW_EXCEPTION(boost::thread_interrupted);
 	TRY_RETHROW_EXCEPTION(boost::thread_exception);
 	TRY_RETHROW_EXCEPTION(boost::condition_error);
-	
+
 	throw tracable_exception(*e);
 }
 
@@ -282,6 +285,20 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 	}
 	stream << "  Message from application: " << appMessage << "\n";
 	P_ERROR(stream.str());
+
+	if (config->agentsOptions != NULL) {
+		HookScriptOptions hOptions;
+		hOptions.name = "spawn_failed";
+		hOptions.spec = config->agentsOptions->get("hook_spawn_failed", false);
+		hOptions.agentsOptions = config->agentsOptions;
+		hOptions.environment.push_back(make_pair("PASSENGER_APP_ROOT", options.appRoot));
+		hOptions.environment.push_back(make_pair("PASSENGER_APP_GROUP_NAME", options.getAppGroupName()));
+		hOptions.environment.push_back(make_pair("PASSENGER_ERROR_MESSAGE", e.what()));
+		hOptions.environment.push_back(make_pair("PASSENGER_ERROR_ID", errorId));
+		hOptions.environment.push_back(make_pair("PASSENGER_APP_ERROR_MESSAGE", appMessage));
+		oxt::thread(boost::bind(runHookScripts, hOptions),
+			"Hook: spawn_failed", 256 * 1024);
+	}
 }
 
 
@@ -337,7 +354,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 	ExceptionPtr exception;
 
 	PoolPtr pool = getPool();
-	
+
 	P_TRACE(2, "Initializing SuperGroup " << inspect() << " in the background...");
 	try {
 		componentInfos = loadComponentInfos(options);
@@ -355,7 +372,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 		processAndLogNewSpawnException(*spawnException, options,
 			pool->getSpawnerConfig());
 	}
-	
+
 	Pool::DebugSupportPtr debug = pool->debugSupport;
 	vector<Callback> actions;
 	{
@@ -374,14 +391,14 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 		P_TRACE(2, "Initialization of SuperGroup " << inspect() << " almost done; grabbed lock");
 		assert(state == INITIALIZING);
 		verifyInvariants();
-		
+
 		if (componentInfos.empty()) {
 			/* Somehow initialization failed. Maybe something has deleted
 			 * the supergroup files while we're working.
 			 */
 			assert(exception != NULL);
 			setState(DESTROYED);
-			
+
 			actions.reserve(getWaitlist.size());
 			while (!getWaitlist.empty()) {
 				const GetWaiter &waiter = getWaitlist.front();
@@ -403,7 +420,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 			setState(READY);
 			assignGetWaitlistToGroups(actions);
 		}
-		
+
 		verifyInvariants();
 		P_TRACE(2, "Done initializing SuperGroup " << inspect());
 	}
@@ -419,14 +436,14 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 	TRACE_POINT();
 	vector<ComponentInfo> componentInfos = loadComponentInfos(options);
 	vector<ComponentInfo>::const_iterator it;
-	
+
 	PoolPtr pool = getPool();
 	Pool::DebugSupportPtr debug = pool->debugSupport;
 	if (debug != NULL && debug->superGroup) {
 		debug->debugger->send("About to finish SuperGroup restart");
 		debug->messages->recv("Proceed with restarting SuperGroup");
 	}
-	
+
 	boost::unique_lock<boost::mutex> lock(getPoolSyncher(pool));
 	if (OXT_UNLIKELY(this->generation != generation)) {
 		return;
@@ -434,14 +451,14 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 
 	assert(state == RESTARTING);
 	verifyInvariants();
-	
+
 	vector<GroupPtr> allGroups;
 	vector<GroupPtr> updatedGroups;
 	vector<GroupPtr> newGroups;
 	vector<GroupPtr>::const_iterator g_it;
 	vector<Callback> actions;
 	this->options = options;
-	
+
 	// Update the component information for existing groups.
 	UPDATE_TRACE_POINT();
 	for (it = componentInfos.begin(); it != componentInfos.end(); it++) {
@@ -464,22 +481,22 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 		// allGroups must be in the same order as componentInfos.
 		allGroups.push_back(group);
 	}
-	
+
 	// Some components might have been deleted, so delete the
 	// corresponding groups.
 	detachAllGroups(groups, actions);
-	
+
 	// Tell all previous existing groups to restart.
 	for (g_it = updatedGroups.begin(); g_it != updatedGroups.end(); g_it++) {
 		GroupPtr group = *g_it;
 		group->restart(options);
 	}
-	
+
 	groups = allGroups;
 	defaultGroup = findDefaultGroup(allGroups);
 	setState(READY);
 	assignGetWaitlistToGroups(actions);
-	
+
 	UPDATE_TRACE_POINT();
 	verifyInvariants();
 	lock.unlock();
@@ -491,6 +508,7 @@ Group::Group(const SuperGroupPtr &_superGroup, const Options &options, const Com
 	: superGroup(_superGroup),
 	  name(_superGroup->name + "#" + info.name),
 	  secret(generateSecret(_superGroup)),
+	  uuid(generateUuid(_superGroup)),
 	  componentInfo(info)
 {
 	enabledCount   = 0;
@@ -565,7 +583,7 @@ Group::onSessionClose(const ProcessPtr &process, Session *session) {
 	P_TRACE(2, "Session closed for process " << process->inspect());
 	verifyInvariants();
 	UPDATE_TRACE_POINT();
-	
+
 	/* Update statistics. */
 	process->sessionClosed(session);
 	assert(process->getLifeStatus() == Process::ALIVE);
@@ -603,6 +621,7 @@ Group::onSessionClose(const ProcessPtr &process, Session *session) {
 		&& enabledCount > 0;
 
 	if (shouldDetach || shouldDisable) {
+		UPDATE_TRACE_POINT();
 		vector<Callback> actions;
 
 		if (shouldDetach) {
@@ -630,12 +649,14 @@ Group::onSessionClose(const ProcessPtr &process, Session *session) {
 			removeFromDisableWaitlist(process, DR_SUCCESS, actions);
 			maybeInitiateOobw(process);
 		}
-		
+
 		pool->fullVerifyInvariants();
 		lock.unlock();
 		runAllActions(actions);
 
 	} else {
+		UPDATE_TRACE_POINT();
+
 		// This could change process->enabled.
 		maybeInitiateOobw(process);
 
@@ -695,7 +716,7 @@ Group::maybeInitiateOobw(const ProcessPtr &process) {
 void
 Group::lockAndMaybeInitiateOobw(const ProcessPtr &process, DisableResult result, GroupPtr self) {
 	TRACE_POINT();
-	
+
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
 	boost::unique_lock<boost::mutex> lock(pool->syncher);
@@ -766,10 +787,10 @@ Group::initiateOobw(const ProcessPtr &process) {
 			P_BUG("Unexpected disable() result " << result);
 		}
 	}
-	
+
 	assert(process->enabled == Process::DISABLED);
 	assert(process->sessions == 0);
-	
+
 	P_DEBUG("Initiating OOBW request for process " << process->inspect());
 	interruptableThreads.create_thread(
 		boost::bind(&Group::spawnThreadOOBWRequest, this, shared_from_this(), process),
@@ -795,7 +816,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		debug->debugger->send("OOBW request about to start");
 		debug->messages->recv("Proceed with OOBW request");
 	}
-	
+
 	UPDATE_TRACE_POINT();
 	{
 		// Standard resource management boilerplate stuff...
@@ -816,13 +837,13 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 			}
 			return;
 		}
-		
+
 		assert(process->oobwStatus == Process::OOBW_IN_PROGRESS);
 		assert(process->sessions == 0);
 		socket = process->sessionSockets.top();
 		assert(socket != NULL);
 	}
-	
+
 	UPDATE_TRACE_POINT();
 	unsigned long long timeout = 1000 * 1000 * 60; // 1 min
 	try {
@@ -835,22 +856,22 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		connection = socket->checkoutConnection();
 		connection.fail = true;
 		ScopeGuard guard(boost::bind(&Socket::checkinConnection, socket, connection));
-		
+
 		// This is copied from RequestHandler when it is sending data using the
 		// "session" protocol.
-		char sizeField[sizeof(uint32_t)];
+		char sizeField[sizeof(boost::uint32_t)];
 		SmallVector<StaticString, 10> data;
 
-		data.push_back(StaticString(sizeField, sizeof(uint32_t)));
+		data.push_back(StaticString(sizeField, sizeof(boost::uint32_t)));
 		data.push_back(makeStaticStringWithNull("REQUEST_METHOD"));
 		data.push_back(makeStaticStringWithNull("OOBW"));
 
 		data.push_back(makeStaticStringWithNull("PASSENGER_CONNECT_PASSWORD"));
 		data.push_back(makeStaticStringWithNull(process->connectPassword));
 
-		uint32_t dataSize = 0;
+		boost::uint32_t dataSize = 0;
 		for (unsigned int i = 1; i < data.size(); i++) {
-			dataSize += (uint32_t) data[i].size();
+			dataSize += (boost::uint32_t) data[i].size();
 		}
 		Uint32Message::generate(sizeField, dataSize);
 
@@ -864,7 +885,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 	} catch (const TimeoutException &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 	}
-	
+
 	UPDATE_TRACE_POINT();
 	vector<Callback> actions;
 	{
@@ -874,7 +895,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		if (OXT_UNLIKELY(!process->isAlive() || !isAlive())) {
 			return;
 		}
-		
+
 		process->oobwStatus = Process::OOBW_NOT_ACTIVE;
 		if (process->enabled == Process::DISABLED) {
 			enable(process, actions);
@@ -924,7 +945,7 @@ Group::spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options, un
 
 	PoolPtr pool = getPool();
 	Pool::DebugSupportPtr debug = pool->debugSupport;
-	
+
 	bool done = false;
 	while (!done) {
 		bool shouldFail = false;
@@ -942,7 +963,7 @@ Group::spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options, un
 			P_DEBUG("Begin spawn loop iteration " << iteration);
 			debug->debugger->send("Begin spawn loop iteration " +
 				iteration);
-			
+
 			vector<string> cases;
 			cases.push_back("Proceed with spawn loop iteration " + iteration);
 			cases.push_back("Fail spawn loop iteration " + iteration);
@@ -1094,6 +1115,7 @@ Group::restart(const Options &options, RestartMethod method) {
 	processesBeingSpawned = 0;
 	m_spawning   = false;
 	m_restarting = true;
+	uuid         = generateUuid(getSuperGroup());
 	detachAll(actions);
 	getPool()->interruptableThreads.create_thread(
 		boost::bind(&Group::finalizeRestart, this, shared_from_this(),
@@ -1153,7 +1175,7 @@ Group::finalizeRestart(GroupPtr self, Options options, RestartMethod method,
 	pool->fullVerifyInvariants();
 	assert(m_restarting);
 	UPDATE_TRACE_POINT();
-	
+
 	// Atomically swap the new spawner with the old one.
 	resetOptions(options);
 	oldSpawner = spawner;
@@ -1376,6 +1398,11 @@ Group::generateSecret(const SuperGroupPtr &superGroup) {
 	return superGroup->getPool()->getRandomGenerator()->generateAsciiString(43);
 }
 
+string
+Group::generateUuid(const SuperGroupPtr &superGroup) {
+	return superGroup->getPool()->getRandomGenerator()->generateAsciiString(20);
+}
+
 
 PoolPtr
 Process::getPool() const {
@@ -1508,7 +1535,7 @@ PipeWatcher::threadMain() {
 	while (!this_thread::interruption_requested()) {
 		char buf[1024 * 8];
 		ssize_t ret;
-		
+
 		UPDATE_TRACE_POINT();
 		ret = syscalls::read(fd, buf, sizeof(buf));
 		if (ret == 0) {

data/ext/common/ApplicationPool2/Options.h

@@ -59,47 +59,47 @@ using namespace boost;
  * "!STARTUP_FILE!", then the startup file's group will be used. Otherwise,
  * the primary group of the user that the application process will run as,
  * will be used as group.
- * 
+ *
  * If the user or group that the application process attempts to switch to
  * doesn't exist, then <em>defaultUser</em> and <em>defaultGroup</em>, respectively,
  * will be used.
- * 
+ *
  * Phusion Passenger will attempt to avoid running the application process as
  * root: if <em>user</em> or <em>group</em> is set to the root user or the root group,
  * or if the startup file is owned by root, then <em>defaultUser</em> and
  * <em>defaultGroup</em> will be used instead.
- * 
+ *
  * All this only happen if Phusion Passenger has root privileges. If not, then
  * these options have no effect.
  */
 class Options {
 private:
 	shared_array<char> storage;
-	
+
 	vector<const StaticString *> getStringFields() const {
 		vector<const StaticString *> result;
 		result.reserve(20);
-		
+
 		result.push_back(&appRoot);
 		result.push_back(&appGroupName);
 		result.push_back(&appType);
 		result.push_back(&startCommand);
 		result.push_back(&startupFile);
 		result.push_back(&processTitle);
-		
+
 		result.push_back(&environment);
 		result.push_back(&baseURI);
 		result.push_back(&spawnMethod);
-		
+
 		result.push_back(&user);
 		result.push_back(&group);
 		result.push_back(&defaultUser);
 		result.push_back(&defaultGroup);
 		result.push_back(&restartDir);
-		
+
 		result.push_back(&preexecChroot);
 		result.push_back(&postexecChroot);
-		
+
 		result.push_back(&ruby);
 		result.push_back(&python);
 		result.push_back(&nodejs);
@@ -110,10 +110,10 @@ private:
 		result.push_back(&hostName);
 		result.push_back(&uri);
 		result.push_back(&unionStationKey);
-		
+
 		return result;
 	}
-	
+
 	static inline void
 	appendKeyValue(vector<string> &vec, const char *key, const StaticString &value) {
 		if (!value.empty()) {
@@ -121,44 +121,44 @@ private:
 			vec.push_back(value.toString());
 		}
 	}
-	
+
 	static inline void
 	appendKeyValue(vector<string> &vec, const char *key, const char *value) {
 		vec.push_back(key);
 		vec.push_back(value);
 	}
-	
+
 	static inline void
 	appendKeyValue2(vector<string> &vec, const char *key, long value) {
 		vec.push_back(key);
 		vec.push_back(toString(value));
 	}
-	
+
 	static inline void
 	appendKeyValue3(vector<string> &vec, const char *key, unsigned long value) {
 		vec.push_back(key);
 		vec.push_back(toString(value));
 	}
-	
+
 	static inline void
 	appendKeyValue4(vector<string> &vec, const char *key, bool value) {
 		vec.push_back(key);
 		vec.push_back(value ? "true" : "false");
 	}
-	
+
 public:
 	/*********** Spawn options that should be set by the caller ***********
 	 * These are the options that are relevant while spawning an application
 	 * process. These options are only used during spawning.
 	 */
-	
+
 	/**
 	 * The root directory of the application to spawn. In case of a Ruby on Rails
 	 * application, this is the folder that contains 'app/', 'public/', 'config/',
 	 * etc. This must be a valid directory, but the path does not have to be absolute.
 	 */
 	StaticString appRoot;
-	
+
 	/**
 	 * A name used by ApplicationPool to uniquely identify an application.
 	 * If one tries to get() from the application pool with name "A", then get()
@@ -168,7 +168,7 @@ public:
 	 * If left empty, then the app root is used as the app group name.
 	 */
 	StaticString appGroupName;
-	
+
 	/** The application's type, used for determining the command to invoke to
 	 * spawn an application process as well as determining the startup file's
 	 * filename. It can be one of the app type names in AppType.cpp, or the
@@ -176,17 +176,17 @@ public:
 	 * 'startupFile' (which MUST be set) will dictate the startup command
 	 * and the startup file's filename. */
 	StaticString appType;
-	
+
 	/** The command for spawning the application process. This is a list of
 	 * arguments, separated by '\t', e.g. "ruby\tfoo.rb". Only used
 	 * during spawning and only if appType.empty(). */
 	StaticString startCommand;
-	
+
 	/** Filename of the application's startup file. Only actually used for
 	 * determining user switching info. Only used during spawning and only
 	 * if appType.empty(). */
 	StaticString startupFile;
-	
+
 	/** The process title to assign to the application process. Only used
 	 * during spawning. May be empty in which case no particular process
 	 * title is assigned. Only used during spawning and only if
@@ -197,17 +197,17 @@ public:
 	 * Defaults to DEFAULT_LOG_LEVEL.
 	 */
 	int logLevel;
-	
+
 	/** The maximum amount of time, in milliseconds, that may be spent
 	 * on spawning the process or the preloader. */
 	unsigned int startTimeout;
-	
+
 	/**
 	 * The RAILS_ENV/RACK_ENV environment that should be used. May not be an
 	 * empty string.
 	 */
 	StaticString environment;
-	
+
 	/**
 	 * The base URI on which the application runs. If the application is
 	 * running on the root URI, then this value must be "/".
@@ -215,12 +215,12 @@ public:
 	 * @invariant baseURI != ""
 	 */
 	StaticString baseURI;
-	
+
 	/**
 	 * Spawning method, either "smart" or "direct".
 	 */
 	StaticString spawnMethod;
-	
+
 	/** See overview. */
 	StaticString user;
 	/** See class overview. */
@@ -229,16 +229,16 @@ public:
 	StaticString defaultUser;
 	/** See class overview. Defaults to the defaultUser's primary group. */
 	StaticString defaultGroup;
-	
+
 	/**
 	 * The directory which contains restart.txt and always_restart.txt.
 	 * An empty string means that the default directory should be used.
 	 */
 	StaticString restartDir;
-	
+
 	StaticString preexecChroot;
 	StaticString postexecChroot;
-	
+
 	/**
 	 * Path to the Ruby interpreter to use, in case the application to spawn
 	 * is a Ruby app.
@@ -256,31 +256,31 @@ public:
 	 * is a Node.js app.
 	 */
 	StaticString nodejs;
-	
+
 	/**
 	 * Any rights that the spawned application process may have. The SpawnManager
 	 * will create a new account for each spawned app, and that account will be
 	 * assigned these rights.
 	 */
 	Account::Rights rights;
-	
+
 	/**
 	 * Environment variables which should be passed to the spawned application
 	 * process.
 	 */
 	vector< pair<StaticString, StaticString> > environmentVariables;
-	
+
 	/** Whether debugger support should be enabled. */
 	bool debugger;
-	
+
 	/** Whether to load environment variables set in shell startup
 	 * files (e.g. ~/.bashrc) during spawning.
 	 */
 	bool loadShellEnvvars;
-	
+
 	/** Whether Union Station logging should be enabled. Enabling this option will
 	 * result in:
-	 * 
+	 *
 	 *  - The application enabling its Union Station support.
 	 *  - Periodic tasks such as `collectAnalytics()` to log things to Union Station.
 	 *
@@ -300,13 +300,13 @@ public:
 	 * during unit tests.
 	 */
 	bool raiseInternalError;
-	
-	
+
+
 	/*********** Per-group pool options that should be set by the caller ***********
 	 * These options dictate how Pool will manage processes, routing, etc. within
 	 * a single Group. These options are not process-specific, only group-specific.
 	 */
-	
+
 	/**
 	 * The minimum number of processes for the current group that the application
 	 * pool's cleaner thread should keep around.
@@ -321,7 +321,7 @@ public:
 	 * A value of 0 means unspecified, and has no effect.
 	 */
 	unsigned int maxProcesses;
-	
+
 	/** The number of seconds that preloader processes may stay alive idling. */
 	long maxPreloaderIdleTime;
 
@@ -351,20 +351,20 @@ public:
 	StaticString unionStationKey;
 
 	/*-----------------*/
-	
-	
+
+
 	/*********** Per-request pool options that should be set by the caller ***********
 	 * These options also dictate how Pool will manage processes, etc. Unlike the
 	 * per-group options, these options are customizable on a per-request basis.
 	 * Their effects also don't persist longer than a single request.
 	 */
-	
+
 	/** Current request host name. */
 	StaticString hostName;
-	
+
 	/** Current request URI. */
 	StaticString uri;
-	
+
 	/**
 	 * The Union Station log transaction that this request belongs to.
 	 * May be the null pointer, in which case Union Station logging is
@@ -381,7 +381,7 @@ public:
 	 * A sticky session ID for routing to a specific process.
 	 */
 	unsigned int stickySessionId;
-	
+
 	/**
 	 * A throttling rate for file stats. When set to a non-zero value N,
 	 * restart.txt and other files which are usually stat()ted on every
@@ -408,19 +408,26 @@ public:
 
 	/*-----------------*/
 	/*-----------------*/
-	
-	
+
+
 	/*********** Spawn options automatically set by Pool ***********
 	 * These options are passed to the Spawner. The Pool::get() caller may not
 	 * see these values.
 	 */
-	
+
 	/** The secret key of the pool group that the spawned process is to belong to. */
 	StaticString groupSecret;
-	
-	
+
+	/**
+	 * A UUID that's generated on Group initialization, and changes every time
+	 * the Group receives a restart command. Allows Union Station to track app
+	 * restarts.
+	 */
+	StaticString groupUuid;
+
+
 	/*********************************/
-	
+
 	/**
 	 * Creates a new Options object with the default values filled in.
 	 * One must still set appRoot manually, after having used this constructor.
@@ -428,25 +435,25 @@ public:
 	Options() {
 		logLevel                = DEFAULT_LOG_LEVEL;
 		startTimeout            = 90 * 1000;
-		environment             = "production";
-		baseURI                 = "/";
-		spawnMethod             = "smart";
-		defaultUser             = "nobody";
-		ruby                    = DEFAULT_RUBY;
-		python                  = DEFAULT_PYTHON;
-		nodejs                  = DEFAULT_NODEJS;
+		environment             = P_STATIC_STRING("production");
+		baseURI                 = P_STATIC_STRING("/");
+		spawnMethod             = P_STATIC_STRING("smart");
+		defaultUser             = P_STATIC_STRING("nobody");
+		ruby                    = P_STATIC_STRING(DEFAULT_RUBY);
+		python                  = P_STATIC_STRING(DEFAULT_PYTHON);
+		nodejs                  = P_STATIC_STRING(DEFAULT_NODEJS);
 		rights                  = DEFAULT_BACKEND_ACCOUNT_RIGHTS;
 		debugger                = false;
 		loadShellEnvvars        = true;
 		analytics               = false;
 		raiseInternalError      = false;
-		
+
 		minProcesses            = 1;
 		maxProcesses            = 0;
 		maxPreloaderIdleTime    = -1;
 		maxOutOfBandWorkInstances = 1;
 		maxRequestQueueSize     = 100;
-		
+
 		stickySessionId         = 0;
 		statThrottleRate        = 0;
 		maxRequests             = 0;
@@ -454,17 +461,17 @@ public:
 
 		/*********************************/
 	}
-	
+
 	Options copy() const {
 		return *this;
 	}
-	
+
 	Options copyAndPersist() const {
 		Options cpy(*this);
 		cpy.persist(*this);
 		return cpy;
 	}
-	
+
 	/**
 	 * Assign <em>other</em>'s string fields' values into this Option
 	 * object, and store the data in this Option object's internal storage
@@ -476,9 +483,9 @@ public:
 		unsigned int i;
 		size_t otherLen = 0;
 		char *end;
-		
+
 		assert(strings.size() == otherStrings.size());
-		
+
 		// Calculate the desired length of the internal storage area.
 		// All strings are NULL-terminated.
 		for (i = 0; i < otherStrings.size(); i++) {
@@ -488,53 +495,53 @@ public:
 			otherLen += environmentVariables[i].first.size() + 1;
 			otherLen += environmentVariables[i].second.size() + 1;
 		}
-		
+
 		shared_array<char> data(new char[otherLen]);
 		end = data.get();
-		
+
 		// Copy string fields into the internal storage area.
 		for (i = 0; i < otherStrings.size(); i++) {
 			const StaticString *str = strings[i];
 			const StaticString *otherStr = otherStrings[i];
-			
+
 			// Point current object's field to the data in the
 			// internal storage area.
 			*const_cast<StaticString *>(str) = StaticString(end, otherStr->size());
-			
+
 			// Copy over the string data.
 			memcpy(end, otherStr->c_str(), otherStr->size());
 			end += otherStr->size();
 			*end = '\0';
 			end++;
 		}
-		
+
 		// Copy environmentVariables names and values into the internal storage area.
 		for (i = 0; i < other.environmentVariables.size(); i++) {
 			const pair<StaticString, StaticString> &p = other.environmentVariables[i];
-			
+
 			environmentVariables[i] = make_pair(
 				StaticString(end, p.first.size()),
 				StaticString(end + p.first.size() + 1, p.second.size())
 			);
-			
+
 			// Copy over string data.
 			memcpy(end, p.first.data(), p.first.size());
 			end += p.first.size();
 			*end = '\0';
 			end++;
-			
+
 			// Copy over value data.
 			memcpy(end, p.second.data(), p.second.size());
 			end += p.second.size();
 			*end = '\0';
 			end++;
 		}
-		
+
 		storage = data;
-		
+
 		return *this;
 	}
-	
+
 	Options &clearPerRequestFields() {
 		hostName = StaticString();
 		uri      = StaticString();
@@ -553,7 +560,7 @@ public:
 		PER_GROUP_POOL_OPTIONS = 1 << 1,
 		ALL_OPTIONS = ~0
 	};
-	
+
 	/**
 	 * Append information in this Options object to the given string vector, except
 	 * for environmentVariables. You can customize what information you want through
@@ -601,7 +608,7 @@ public:
 			appendKeyValue3(vec, "max_out_of_band_work_instances", maxOutOfBandWorkInstances);
 			appendKeyValue (vec, "union_station_key",   unionStationKey);
 		}
-		
+
 		/*********************************/
 	}
 
@@ -611,7 +618,7 @@ public:
 	{
 		vector<string> args;
 		unsigned int i;
-		
+
 		toVector(args, resourceLocator, fields);
 		for (i = 0; i < args.size(); i += 2) {
 			stream << "<" << args[i] << ">";
@@ -619,7 +626,7 @@ public:
 			stream << "</" << args[i] << ">";
 		}
 	}
-	
+
 	/**
 	 * Returns the app group name. If there is no explicitly set app group name
 	 * then the app root is considered to be the app group name.
@@ -631,28 +638,28 @@ public:
 			return appGroupName;
 		}
 	}
-	
+
 	string getStartCommand(const ResourceLocator &resourceLocator) const {
-		if (appType == "classic-rails") {
+		if (appType == P_STATIC_STRING("classic-rails")) {
 			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/classic-rails-loader.rb";
-		} else if (appType == "rack") {
+		} else if (appType == P_STATIC_STRING("rack")) {
 			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/rack-loader.rb";
-		} else if (appType == "wsgi") {
+		} else if (appType == P_STATIC_STRING("wsgi")) {
 			return python + "\t" + resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py";
-		} else if (appType == "node") {
+		} else if (appType == P_STATIC_STRING("node")) {
 			return nodejs + "\t" + resourceLocator.getHelperScriptsDir() + "/node-loader.js";
-		} else if (appType == "meteor") {
+		} else if (appType == P_STATIC_STRING("meteor")) {
 			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb";
 		} else {
 			return startCommand;
 		}
 	}
-	
+
 	StaticString getStartupFile() const {
 		if (startupFile.empty()) {
 			const char *result = getAppTypeStartupFile(getAppType(appType));
 			if (result == NULL) {
-				return "";
+				return P_STATIC_STRING("");
 			} else {
 				return result;
 			}
@@ -660,7 +667,7 @@ public:
 			return startupFile;
 		}
 	}
-	
+
 	StaticString getProcessTitle() const {
 		const char *result = getAppTypeProcessTitle(getAppType(appType));
 		if (result == NULL) {
@@ -669,7 +676,7 @@ public:
 			return result;
 		}
 	}
-	
+
 	unsigned long getMaxPreloaderIdleTime() const {
 		if (maxPreloaderIdleTime == -1) {
 			return 5 * 60;