passenger 4.0.2 → 4.0.3

data/ext/common/agents/Watchdog/HelperAgentWatcher.cpp

@@ -0,0 +1,93 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+class HelperAgentWatcher: public AgentWatcher {
+protected:
+	string helperAgentFilename;
+	VariantMap params, report;
+	string requestSocketFilename;
+	string messageSocketFilename;
+	
+	virtual const char *name() const {
+		return "Phusion Passenger helper agent";
+	}
+	
+	virtual string getExeFilename() const {
+		return helperAgentFilename;
+	}
+	
+	virtual void execProgram() const {
+		if (hasEnvOption("PASSENGER_RUN_HELPER_AGENT_IN_VALGRIND", false)) {
+			execlp("valgrind", "valgrind", "--dsymutil=yes",
+				helperAgentFilename.c_str(), (char *) 0);
+		} else {
+			execl(helperAgentFilename.c_str(), "PassengerHelperAgent", (char *) 0);
+		}
+	}
+	
+	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
+		VariantMap options = agentsOptions;
+		params.addTo(options);
+		options.writeToFd(fd);
+	}
+	
+	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) {
+		if (args[0] == "initialized") {
+			requestSocketFilename = args[1];
+			messageSocketFilename = args[2];
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+public:
+	HelperAgentWatcher(const ResourceLocator &resourceLocator) {
+		helperAgentFilename = resourceLocator.getAgentsDir() + "/PassengerHelperAgent";
+
+		report
+			.set("request_socket_filename",
+				agentsOptions.get("request_socket_filename", false,
+					generation->getPath() + "/request"))
+			.set("request_socket_password",
+				agentsOptions.get("request_socket_password", false,
+					randomGenerator->generateAsciiString(REQUEST_SOCKET_PASSWORD_SIZE)))
+			.set("helper_agent_admin_socket_address",
+				agentsOptions.get("helper_agent_admin_socket_address", false,
+					"unix:" + generation->getPath() + "/helper_admin"))
+			.set("helper_agent_exit_password",
+				agentsOptions.get("helper_agent_exit_password", false,
+					randomGenerator->generateAsciiString(MESSAGE_SERVER_MAX_PASSWORD_SIZE)));
+
+		params = report;
+		params
+			.set("logging_agent_address", loggingAgentAddress)
+			.set("logging_agent_password", loggingAgentPassword);
+	}
+	
+	virtual void reportAgentsInformation(VariantMap &report) {
+		this->report.addTo(report);
+	}
+};

data/ext/common/agents/Watchdog/LoggingAgentWatcher.cpp

@@ -0,0 +1,68 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+class LoggingAgentWatcher: public AgentWatcher {
+protected:
+	string agentFilename;
+	string socketAddress;
+	
+	virtual const char *name() const {
+		return "Phusion Passenger logging agent";
+	}
+	
+	virtual string getExeFilename() const {
+		return agentFilename;
+	}
+	
+	virtual void execProgram() const {
+		execl(agentFilename.c_str(), "PassengerLoggingAgent", (char *) 0);
+	}
+	
+	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
+		VariantMap options = agentsOptions;
+		options.set("logging_agent_address", loggingAgentAddress);
+		options.set("logging_agent_password", loggingAgentPassword);
+		options.writeToFd(fd);
+	}
+	
+	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) {
+		if (args[0] == "initialized") {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+public:
+	LoggingAgentWatcher(const ResourceLocator &resourceLocator) {
+		agentFilename = resourceLocator.getAgentsDir() + "/PassengerLoggingAgent";
+	}
+	
+	virtual void reportAgentsInformation(VariantMap &report) {
+		report
+			.set("logging_socket_address", loggingAgentAddress)
+			.set("logging_socket_password", loggingAgentPassword);
+	}
+};

data/ext/common/agents/Watchdog/Main.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -27,6 +27,7 @@
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/foreach.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <string>
 
@@ -63,713 +64,44 @@ using namespace oxt;
 using namespace Passenger;
 
 
+enum OomFileType {
+	OOM_ADJ,
+	OOM_SCORE_ADJ
+};
+
+#define REQUEST_SOCKET_PASSWORD_SIZE     64
+
+class ServerInstanceDirToucher;
+static bool hasEnvOption(const char *name, bool defaultValue = false);
+static void setOomScore(const StaticString &score);
+
+
 /** The options that were passed to AgentsStarter. */
-static VariantMap     agentsOptions;
-static pid_t   webServerPid;
+static VariantMap agentsOptions;
 static string  tempDir;
 static bool    userSwitching;
 static string  defaultUser;
 static string  defaultGroup;
 static uid_t   webServerWorkerUid;
 static gid_t   webServerWorkerGid;
-static string  passengerRoot;
 static string  serializedPrestartURLs;
 
+/***** Working objects *****/
 static string oldOomScore;
+static RandomGenerator *randomGenerator;
+static EventFd *errorEvent;
+static ResourceLocator *resourceLocator;
 static ServerInstanceDirPtr serverInstanceDir;
 static ServerInstanceDir::GenerationPtr generation;
+static ServerInstanceDirToucher *serverInstanceDirToucher;
 static string loggingAgentAddress;
 static string loggingAgentPassword;
-static RandomGenerator *randomGenerator;
-static EventFd *errorEvent;
-
-#define REQUEST_SOCKET_PASSWORD_SIZE     64
-
-static bool hasEnvOption(const char *name, bool defaultValue = false);
-static void setOomScore(const StaticString &score);
-
-
-/**
- * Abstract base class for watching agent processes.
- */
-class AgentWatcher: public enable_shared_from_this<AgentWatcher> {
-private:
-	/** The watcher thread. */
-	oxt::thread *thr;
-	
-	void threadMain(shared_ptr<AgentWatcher> self) {
-		try {
-			pid_t pid, ret;
-			int status, e;
-			
-			while (!this_thread::interruption_requested()) {
-				{
-					lock_guard<boost::mutex> l(lock);
-					pid = this->pid;
-				}
-				
-				// Process can be started before the watcher thread is launched.
-				if (pid == 0) {
-					pid = start();
-				}
-				ret = syscalls::waitpid(pid, &status, 0);
-				if (ret == -1 && errno == ECHILD) {
-					/* If the agent is attached to gdb then waitpid()
-					 * here can return -1 with errno == ECHILD.
-					 * Fallback to kill() polling for checking
-					 * whether the agent is alive.
-					 */
-					ret = pid;
-					status = 0;
-					P_WARN("waitpid() on " << name() << " (pid=" << pid <<
-						") returned -1 with " <<
-						"errno = ECHILD, falling back to kill polling");
-					waitpidUsingKillPolling(pid);
-					e = 0;
-				} else {
-					e = errno;
-				}
-				
-				{
-					lock_guard<boost::mutex> l(lock);
-					this->pid = 0;
-				}
-				
-				this_thread::disable_interruption di;
-				this_thread::disable_syscall_interruption dsi;
-				if (ret == -1) {
-					P_WARN(name() << " (pid=" << pid << ") crashed or killed for "
-						"an unknown reason (errno = " <<
-						strerror(e) << "), restarting it...");
-				} else if (WIFEXITED(status)) {
-					if (WEXITSTATUS(status) == 0) {
-						/* When the web server is gracefully exiting, it will
-						 * tell one or more agents to gracefully exit with exit
-						 * status 0. If we see this then it means the watchdog
-						 * is gracefully shutting down too and we should stop
-						 * watching.
-						 */
-						return;
-					} else {
-						P_WARN(name() << " (pid=" << pid <<
-							") crashed with exit status " <<
-							WEXITSTATUS(status) << ", restarting it...");
-					}
-				} else {
-					P_WARN(name() << " (pid=" << pid <<
-						") crashed with signal " <<
-						getSignalName(WTERMSIG(status)) <<
-						", restarting it...");
-				}
-
-				const char *sleepTime;
-				if ((sleepTime = getenv("PASSENGER_AGENT_RESTART_SLEEP")) != NULL) {
-					sleep(atoi(sleepTime));
-				}
-			}
-		} catch (const boost::thread_interrupted &) {
-		} catch (const tracable_exception &e) {
-			lock_guard<boost::mutex> l(lock);
-			threadExceptionMessage = e.what();
-			threadExceptionBacktrace = e.backtrace();
-			errorEvent->notify();
-		} catch (const std::exception &e) {
-			lock_guard<boost::mutex> l(lock);
-			threadExceptionMessage = e.what();
-			errorEvent->notify();
-		} catch (...) {
-			lock_guard<boost::mutex> l(lock);
-			threadExceptionMessage = "Unknown error";
-			errorEvent->notify();
-		}
-	}
-	
-protected:
-	/** PID of the process we're watching. 0 if no process is started at this time. */
-	pid_t pid;
-	
-	/** If the watcher thread threw an uncaught exception then its information will
-	 * be stored here so that the main thread can check whether a watcher encountered
-	 * an error. These are empty strings if everything is OK.
-	 */
-	string threadExceptionMessage;
-	string threadExceptionBacktrace;
-	
-	/** The agent process's feedback fd. */
-	FileDescriptor feedbackFd;
-	
-	/**
-	 * Lock for protecting the exchange of data between the main thread and
-	 * the watcher thread.
-	 */
-	mutable boost::mutex lock;
-	
-	/**
-	 * Returns the filename of the agent process's executable. This method may be
-	 * called in a forked child process and may therefore not allocate memory.
-	 */
-	virtual string getExeFilename() const = 0;
-	
-	/**
-	 * This method is to exec() the agent with the right arguments.
-	 * It is called from within a forked child process, so don't do any dynamic
-	 * memory allocations in here. It must also not throw any exceptions.
-	 * It must also preserve the value of errno after exec() is called.
-	 */
-	virtual void execProgram() const {
-		execl(getExeFilename().c_str(),
-			getExeFilename().c_str(),
-			"3",  // feedback fd
-			(char *) 0);
-	}
-	
-	/**
-	 * This method is to send startup arguments to the agent process through
-	 * the given file descriptor, which is the agent process's feedback fd.
-	 * May throw arbitrary exceptions.
-	 */
-	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) = 0;
-	
-	/**
-	 * This method is to process the startup info that the agent process has
-	 * sent back. May throw arbitrary exceptions.
-	 */
-	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) = 0;
-	
-	/**
-	 * Kill a process with SIGKILL, and attempt to kill its children too. 
-	 * Then wait until it has quit.
-	 */
-	static void killAndWait(pid_t pid) {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		// If the process is a process group leader then killing the
-		// group will likely kill all its child processes too.
-		if (syscalls::killpg(pid, SIGKILL) == -1) {
-			syscalls::kill(pid, SIGKILL);
-		}
-		syscalls::waitpid(pid, NULL, 0);
-	}
-	
-	/**
-	 * Behaves like <tt>waitpid(pid, status, WNOHANG)</tt>, but waits at most
-	 * <em>timeout</em> miliseconds for the process to exit.
-	 */
-	static int timedWaitPid(pid_t pid, int *status, unsigned long long timeout) {
-		Timer timer;
-		int ret;
-		
-		do {
-			ret = syscalls::waitpid(pid, status, WNOHANG);
-			if (ret > 0 || ret == -1) {
-				return ret;
-			} else {
-				syscalls::usleep(10000);
-			}
-		} while (timer.elapsed() < timeout);
-		return 0; // timed out
-	}
-	
-	static void waitpidUsingKillPolling(pid_t pid) {
-		bool done = false;
-		
-		while (!done) {
-			int ret = syscalls::kill(pid, 0);
-			done = ret == -1;
-			if (!done) {
-				syscalls::usleep(20000);
-			}
-		}
-	}
-	
-public:
-	AgentWatcher() {
-		thr = NULL;
-		pid = 0;
-	}
-	
-	virtual ~AgentWatcher() {
-		delete thr;
-	}
-	
-	/**
-	 * Send the started agent process's startup information over the given
-	 * file descriptor, to the starter process. May throw arbitrary exceptions.
-	 *
-	 * @pre start() has been called and succeeded.
-	 */
-	virtual void sendStartupInfo(int fd) = 0;
-	
-	/** Returns the name of the agent that this class is watching. */
-	virtual const char *name() const = 0;
-	
-	/**
-	 * Starts the agent process. May throw arbitrary exceptions.
-	 */
-	virtual pid_t start() {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		string exeFilename = getExeFilename();
-		SocketPair fds;
-		int e, ret;
-		pid_t pid;
-		
-		/* Create feedback fd for this agent process. We'll send some startup
-		 * arguments to this agent process through this fd, and we'll receive
-		 * startup information through it as well.
-		 */
-		fds = createUnixSocketPair();
-		
-		pid = syscalls::fork();
-		if (pid == 0) {
-			// Child
-			
-			/* Make sure file descriptor FEEDBACK_FD refers to the newly created
-			 * feedback fd (fds[1]) and close all other file descriptors.
-			 * In this child process we don't care about the original FEEDBACK_FD
-			 * (which is the Watchdog's communication channel to the agents starter.)
-			 *
-			 * fds[1] is guaranteed to be != FEEDBACK_FD because the watchdog
-			 * is started with FEEDBACK_FD already assigned.
-			 */
-			syscalls::close(fds[0]);
-			
-			if (syscalls::dup2(fds[1], FEEDBACK_FD) == -1) {
-				/* Something went wrong, report error through feedback fd. */
-				e = errno;
-				try {
-					writeArrayMessage(fds[1],
-						"system error before exec",
-						"dup2() failed",
-						toString(e).c_str(),
-						NULL);
-					_exit(1);
-				} catch (...) {
-					fprintf(stderr, "Passenger Watchdog: dup2() failed: %s (%d)\n",
-						strerror(e), e);
-					fflush(stderr);
-					_exit(1);
-				}
-			}
-			
-			closeAllFileDescriptors(FEEDBACK_FD);
-			
-			/* Become the process group leader so that the watchdog can kill the
-			 * agent as well as all its descendant processes. */
-			setpgid(getpid(), getpid());
-			
-			setOomScore(oldOomScore);
-			
-			try {
-				execProgram();
-			} catch (...) {
-				fprintf(stderr, "PassengerWatchdog: execProgram() threw an exception\n");
-				fflush(stderr);
-				_exit(1);
-			}
-			e = errno;
-			try {
-				writeArrayMessage(FEEDBACK_FD,
-					"exec error",
-					toString(e).c_str(),
-					NULL);
-			} catch (...) {
-				fprintf(stderr, "Passenger Watchdog: could not execute %s: %s (%d)\n",
-					exeFilename.c_str(), strerror(e), e);
-				fflush(stderr);
-			}
-			_exit(1);
-		} else if (pid == -1) {
-			// Error
-			e = errno;
-			throw SystemException("Cannot fork a new process", e);
-		} else {
-			// Parent
-			FileDescriptor feedbackFd = fds[0];
-			vector<string> args;
-			
-			fds[1].close();
-			this_thread::restore_interruption ri(di);
-			this_thread::restore_syscall_interruption rsi(dsi);
-			ScopeGuard failGuard(boost::bind(killAndWait, pid));
-			
-			/* Send startup arguments. Ignore EPIPE and ECONNRESET here
-			 * because the child process might have sent an feedback message
-			 * without reading startup arguments.
-			 */
-			try {
-				sendStartupArguments(pid, feedbackFd);
-			} catch (const SystemException &ex) {
-				if (ex.code() != EPIPE && ex.code() != ECONNRESET) {
-					throw SystemException(string("Unable to start the ") + name() +
-						": an error occurred while sending startup arguments",
-						ex.code());
-				}
-			}
-			
-			// Now read its feedback.
-			try {
-				ret = readArrayMessage(feedbackFd, args);
-			} catch (const SystemException &e) {
-				if (e.code() == ECONNRESET) {
-					ret = false;
-				} else {
-					throw SystemException(string("Unable to start the ") + name() +
-						": unable to read its startup information",
-						e.code());
-				}
-			}
-			if (!ret) {
-				this_thread::disable_interruption di2;
-				this_thread::disable_syscall_interruption dsi2;
-				int status;
-				
-				/* The feedback fd was prematurely closed for an unknown reason.
-				 * Did the agent process crash?
-				 *
-				 * We use timedWaitPid() here because if the process crashed
-				 * because of an uncaught exception, the file descriptor
-				 * might be closed before the process has printed an error
-				 * message, so we give it some time to print the error
-				 * before we kill it.
-				 */
-				ret = timedWaitPid(pid, &status, 5000);
-				if (ret == 0) {
-					/* Doesn't look like it; it seems it's still running.
-					 * We can't do anything without proper feedback so kill
-					 * the agent process and throw an exception.
-					 */
-					failGuard.runNow();
-					throw RuntimeException(string("Unable to start the ") + name() +
-						": it froze and reported an unknown error during its startup");
-				} else if (ret != -1 && WIFSIGNALED(status)) {
-					/* Looks like a crash which caused a signal. */
-					throw RuntimeException(string("Unable to start the ") + name() +
-						": it seems to have been killed with signal " +
-						getSignalName(WTERMSIG(status)) + " during startup");
-				} else if (ret == -1) {
-					/* Looks like it exited after detecting an error. */
-					throw RuntimeException(string("Unable to start the ") + name() +
-						": it seems to have crashed during startup for an unknown reason");
-				} else {
-					/* Looks like it exited after detecting an error, but has an exit code. */
-					throw RuntimeException(string("Unable to start the ") + name() +
-						": it seems to have crashed during startup for an unknown reason, "
-						"with exit code " + toString(WEXITSTATUS(status)));
-				}
-			}
-			
-			if (args[0] == "system error before exec") {
-				throw SystemException(string("Unable to start the ") + name() +
-					": " + args[1], atoi(args[2]));
-			} else if (args[0] == "exec error") {
-				e = atoi(args[1]);
-				if (e == ENOENT) {
-					throw RuntimeException(string("Unable to start the ") + name() +
-						" because its executable (" + getExeFilename() + ") "
-						"doesn't exist. This probably means that your "
-						"Phusion Passenger installation is broken or "
-						"incomplete. Please reinstall Phusion Passenger");
-				} else {
-					throw SystemException(string("Unable to start the ") + name() +
-						" because exec(\"" + getExeFilename() + "\") failed",
-						atoi(args[1]));
-				}
-			} else if (!processStartupInfo(pid, feedbackFd, args)) {
-				throw RuntimeException(string("The ") + name() +
-					" sent an unknown startup info message '" +
-					args[0] + "'");
-			}
-			
-			lock_guard<boost::mutex> l(lock);
-			this->feedbackFd = feedbackFd;
-			this->pid = pid;
-			failGuard.clear();
-			return pid;
-		}
-	}
-	
-	/**
-	 * Start watching the agent process.
-	 *
-	 * @pre start() has been called and succeeded.
-	 * @pre This watcher isn't already watching.
-	 * @throws RuntimeException If a precondition failed.
-	 * @throws thread_interrupted
-	 * @throws thread_resource_error
-	 */
-	virtual void startWatching() {
-		lock_guard<boost::mutex> l(lock);
-		if (pid == 0) {
-			throw RuntimeException("start() hasn't been called yet");
-		}
-		if (thr != NULL) {
-			throw RuntimeException("Already started watching.");
-		}
-		
-		thr = new oxt::thread(boost::bind(&AgentWatcher::threadMain, this, shared_from_this()),
-			name(), 256 * 1024);
-	}
-	
-	static void stopWatching(vector< shared_ptr<AgentWatcher> > &watchers) {
-		vector< shared_ptr<AgentWatcher> >::const_iterator it;
-		oxt::thread *threads[watchers.size()];
-		unsigned int i = 0;
-		
-		for (it = watchers.begin(); it != watchers.end(); it++, i++) {
-			threads[i] = (*it)->thr;
-		}
-		
-		oxt::thread::interrupt_and_join_multiple(threads, watchers.size());
-		for (it = watchers.begin(); it != watchers.end(); it++, i++) {
-			delete (*it)->thr;
-			(*it)->thr = NULL;
-		}
-	}
-	
-	/**
-	 * Force the agent process to shut down. Returns true if it was shut down,
-	 * or false if it wasn't started.
-	 */
-	virtual bool forceShutdown() {
-		lock_guard<boost::mutex> l(lock);
-		if (pid == 0) {
-			return false;
-		} else {
-			killAndWait(pid);
-			this->pid = 0;
-			return true;
-		}
-	}
-	
-	/**
-	 * If the watcher thread has encountered an error, then the error message
-	 * will be stored here. If the error message is empty then it means
-	 * everything is still OK.
-	 */
-	string getErrorMessage() const {
-		lock_guard<boost::mutex> l(lock);
-		return threadExceptionMessage;
-	}
-	
-	/**
-	 * The error backtrace, if applicable.
-	 */
-	string getErrorBacktrace() const {
-		lock_guard<boost::mutex> l(lock);
-		return threadExceptionBacktrace;
-	}
-	
-	/**
-	 * Returns the agent process feedback fd, or -1 if the agent process
-	 * hasn't been started yet. Can be used to check whether this agent process
-	 * has exited without using waitpid().
-	 */
-	const FileDescriptor getFeedbackFd() const {
-		lock_guard<boost::mutex> l(lock);
-		return feedbackFd;
-	}
-};
-
-typedef shared_ptr<AgentWatcher> AgentWatcherPtr;
-
-
-class HelperAgentWatcher: public AgentWatcher {
-protected:
-	string requestSocketFilename;
-	string messageSocketFilename;
-	string helperAgentFilename;
-	string requestSocketPassword;
-	string messageSocketPassword;
-	
-	virtual const char *name() const {
-		return "Phusion Passenger helper agent";
-	}
-	
-	virtual string getExeFilename() const {
-		return helperAgentFilename;
-	}
-	
-	virtual void execProgram() const {
-		if (hasEnvOption("PASSENGER_RUN_HELPER_AGENT_IN_VALGRIND", false)) {
-			execlp("valgrind", "valgrind", "--dsymutil=yes",
-				helperAgentFilename.c_str(), (char *) 0);
-		} else {
-			execl(helperAgentFilename.c_str(), "PassengerHelperAgent", (char *) 0);
-		}
-	}
-	
-	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
-		VariantMap options = agentsOptions;
-		options.set("request_socket_password", Base64::encode(requestSocketPassword)).
-			set("message_socket_password", Base64::encode(messageSocketPassword)).
-			set("logging_agent_address", loggingAgentAddress).
-			set("logging_agent_password", loggingAgentPassword);
-		options.writeToFd(fd);
-	}
-	
-	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) {
-		if (args[0] == "initialized") {
-			requestSocketFilename = args[1];
-			messageSocketFilename = args[2];
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-public:
-	HelperAgentWatcher(const ResourceLocator &resourceLocator) {
-		helperAgentFilename = resourceLocator.getAgentsDir() + "/PassengerHelperAgent";
-		requestSocketPassword = randomGenerator->generateByteString(REQUEST_SOCKET_PASSWORD_SIZE);
-		messageSocketPassword = randomGenerator->generateByteString(MESSAGE_SERVER_MAX_PASSWORD_SIZE);
-	}
-	
-	virtual void sendStartupInfo(int fd) {
-		writeArrayMessage(fd,
-			"HelperAgent info",
-			requestSocketFilename.c_str(),
-			Base64::encode(requestSocketPassword).c_str(),
-			messageSocketFilename.c_str(),
-			Base64::encode(messageSocketPassword).c_str(),
-			NULL);
-	}
-};
 
-
-class LoggingAgentWatcher: public AgentWatcher {
-protected:
-	string agentFilename;
-	string socketAddress;
-	
-	virtual const char *name() const {
-		return "Phusion Passenger logging agent";
-	}
-	
-	virtual string getExeFilename() const {
-		return agentFilename;
-	}
-	
-	virtual void execProgram() const {
-		execl(agentFilename.c_str(), "PassengerLoggingAgent", (char *) 0);
-	}
-	
-	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
-		VariantMap options = agentsOptions;
-		options.set("logging_agent_address", loggingAgentAddress);
-		options.set("logging_agent_password", loggingAgentPassword);
-		options.writeToFd(fd);
-	}
-	
-	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) {
-		if (args[0] == "initialized") {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-public:
-	LoggingAgentWatcher(const ResourceLocator &resourceLocator) {
-		agentFilename = resourceLocator.getAgentsDir() + "/PassengerLoggingAgent";
-	}
-	
-	virtual void sendStartupInfo(int fd) {
-		writeArrayMessage(fd,
-			"LoggingServer info",
-			loggingAgentAddress.c_str(),
-			loggingAgentPassword.c_str(),
-			NULL);
-	}
-};
-
-
-/**
- * Touch all files in the server instance dir every 6 hours in order to prevent /tmp
- * cleaners from weaking havoc:
- * http://code.google.com/p/phusion-passenger/issues/detail?id=365
- */
-class ServerInstanceDirToucher {
-private:
-	oxt::thread *thr;
-	
-	static void
-	threadMain() {
-		while (!this_thread::interruption_requested()) {
-			syscalls::sleep(60 * 60 * 6);
-			
-			begin_touch:
-			
-			this_thread::disable_interruption di;
-			this_thread::disable_syscall_interruption dsi;
-			// Fork a process which touches everything in the server instance dir.
-			pid_t pid = syscalls::fork();
-			if (pid == 0) {
-				// Child
-				int prio, ret, e;
-				
-				closeAllFileDescriptors(2);
-				
-				// Make process nicer.
-				do {
-					prio = getpriority(PRIO_PROCESS, getpid());
-				} while (prio == -1 && errno == EINTR);
-				if (prio != -1) {
-					prio++;
-					if (prio > 20) {
-						prio = 20;
-					}
-					do {
-						ret = setpriority(PRIO_PROCESS, getpid(), prio);
-					} while (ret == -1 && errno == EINTR);
-				} else {
-					perror("getpriority");
-				}
-				
-				do {
-					ret = chdir(serverInstanceDir->getPath().c_str());
-				} while (ret == -1 && errno == EINTR);
-				if (ret == -1) {
-					e = errno;
-					fprintf(stderr, "chdir(\"%s\") failed: %s (%d)\n",
-						serverInstanceDir->getPath().c_str(),
-						strerror(e), e);
-					fflush(stderr);
-					_exit(1);
-				}
-				
-				setOomScore(oldOomScore);
-				
-				execlp("/bin/sh", "/bin/sh", "-c", "find . | xargs touch", (char *) 0);
-				e = errno;
-				fprintf(stderr, "Cannot execute 'find . | xargs touch': %s (%d)\n",
-					strerror(e), e);
-				fflush(stderr);
-				_exit(1);
-			} else if (pid == -1) {
-				// Error
-				P_WARN("Could not touch the server instance directory because "
-					"fork() failed. Retrying in 2 minutes...");
-				this_thread::restore_interruption si(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
-				syscalls::sleep(60 * 2);
-				goto begin_touch;
-			} else {
-				syscalls::waitpid(pid, NULL, 0);
-			}
-		}
-	}
-
-public:
-	ServerInstanceDirToucher() {
-		thr = new oxt::thread(threadMain, "Server instance dir toucher", 256 * 1024);
-	}
-	
-	~ServerInstanceDirToucher() {
-		thr->interrupt_and_join();
-		delete thr;
-	}
-};
+#include "AgentWatcher.cpp"
+#include "HelperAgentWatcher.cpp"
+#include "LoggingAgentWatcher.cpp"
+#include "ServerInstanceDirToucher.cpp"
+static vector<AgentWatcherPtr> watchers;
 
 
 static bool
@@ -790,11 +122,6 @@ hasEnvOption(const char *name, bool defaultValue) {
 	}
 }
 
-enum OomFileType {
-	OOM_ADJ,
-	OOM_SCORE_ADJ
-};
-
 static FILE *
 openOomAdjFile(const char *mode, OomFileType &type) {
 	FILE *f = fopen("/proc/self/oom_score_adj", mode);
@@ -833,6 +160,9 @@ setOomScore(const StaticString &score) {
 	}
 }
 
+/**
+ * Set the current process's OOM score to "never kill".
+ */
 static string
 setOomScoreNeverKill() {
 	string oldScore;
@@ -929,12 +259,12 @@ waitForStarterProcessOrWatchers(vector<AgentWatcherPtr> &watchers) {
 }
 
 static void
-cleanupAgentsInBackground(vector<AgentWatcherPtr> &watchers) {
+cleanupAgentsInBackground(vector<AgentWatcherPtr> &watchers, char *argv[]) {
 	this_thread::disable_interruption di;
 	this_thread::disable_syscall_interruption dsi;
 	pid_t pid;
 	int e;
-	
+
 	pid = fork();
 	if (pid == 0) {
 		// Child
@@ -943,6 +273,11 @@ cleanupAgentsInBackground(vector<AgentWatcherPtr> &watchers) {
 		fd_set fds, fds2;
 		int max, agentProcessesDone;
 		unsigned long long deadline = 30000; // miliseconds
+
+		#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
+			// Change process title.
+			strcpy(argv[0], "PassengerWatchdog (cleaning up...)");
+		#endif
 		
 		// Wait until all agent processes have exited. The starter
 		// process is responsible for telling the individual agents
@@ -991,8 +326,8 @@ cleanupAgentsInBackground(vector<AgentWatcherPtr> &watchers) {
 			P_DEBUG("All Phusion Passenger agent processes have exited. Forcing all subprocesses to shut down.");
 		}
 		for (it = watchers.begin(); it != watchers.end(); it++) {
-				(*it)->forceShutdown();
-			}
+			(*it)->forceShutdown();
+		}
 		
 		// Now clean up the server instance directory.
 		delete generation.get();
@@ -1044,8 +379,8 @@ inferDefaultGroup(const string &defaultUser) {
 	return groupEntry->gr_name;
 }
 
-int
-main(int argc, char *argv[]) {
+static void
+initializeBareEssentials(int argc, char *argv[]) {
 	/*
 	 * Some Apache installations (like on OS X) redirect stdout to /dev/null,
 	 * so that only stderr is redirected to the log file. We therefore
@@ -1066,6 +401,11 @@ main(int argc, char *argv[]) {
 	oldOomScore = setOomScoreNeverKill();
 	
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");
+}
+
+static void
+initializeOptions() {
+	TRACE_POINT();
 	agentsOptions
 		.setDefaultInt ("log_level", DEFAULT_LOG_LEVEL)
 		.setDefault    ("temp_dir", getSystemTempDir())
@@ -1080,111 +420,152 @@ main(int argc, char *argv[]) {
 		.setDefaultInt ("max_instances_per_app", DEFAULT_MAX_INSTANCES_PER_APP)
 		.setDefaultInt ("pool_idle_time", DEFAULT_POOL_IDLE_TIME);
 
-	P_DEBUG("Starting Watchdog...");
-	
-	try {
-		TRACE_POINT();
-		// Required options
-		passengerRoot = agentsOptions.get("passenger_root");
-		webServerPid  = agentsOptions.getPid("web_server_pid");
+	// Check for required options
+	UPDATE_TRACE_POINT();
+	agentsOptions.get("passenger_root");
+	agentsOptions.getPid("web_server_pid");
 
-		// Optional options
-		UPDATE_TRACE_POINT();
-		tempDir       = agentsOptions.get("temp_dir");
-		userSwitching = agentsOptions.getBool("user_switching");
-		defaultUser   = agentsOptions.get("default_user");
-		if (!agentsOptions.has("default_group")) {
-			agentsOptions.set("default_group", inferDefaultGroup(defaultUser));
-		}
-		defaultGroup       = agentsOptions.get("default_group");
-		webServerWorkerUid = agentsOptions.getUid("web_server_worker_uid");
-		webServerWorkerGid = agentsOptions.getGid("web_server_worker_gid");
+	// Fetch optional options
+	UPDATE_TRACE_POINT();
+	tempDir       = agentsOptions.get("temp_dir");
+	userSwitching = agentsOptions.getBool("user_switching");
+	defaultUser   = agentsOptions.get("default_user");
+	if (!agentsOptions.has("default_group")) {
+		agentsOptions.set("default_group", inferDefaultGroup(defaultUser));
+	}
+	defaultGroup       = agentsOptions.get("default_group");
+	webServerWorkerUid = agentsOptions.getUid("web_server_worker_uid");
+	webServerWorkerGid = agentsOptions.getGid("web_server_worker_gid");
 
-		UPDATE_TRACE_POINT();
-		randomGenerator = new RandomGenerator();
-		errorEvent = new EventFd();
-		
-		UPDATE_TRACE_POINT();
-		serverInstanceDir.reset(new ServerInstanceDir(webServerPid, tempDir));
-		generation = serverInstanceDir->newGeneration(userSwitching, defaultUser,
-			defaultGroup, webServerWorkerUid, webServerWorkerGid);
+	P_INFO("Options: " << agentsOptions.inspect());
+}
+
+static void
+initializeWorkingObjects() {
+	TRACE_POINT();
+	randomGenerator = new RandomGenerator();
+	errorEvent = new EventFd();
+	resourceLocator = new ResourceLocator(agentsOptions.get("passenger_root"));
+
+	UPDATE_TRACE_POINT();
+	// Must not used make_shared() here because Watchdog.cpp
+	// deletes the raw pointer in cleanupAgentsInBackground().
+	if (agentsOptions.get("server_instance_dir", false).empty()) {
+		/* We embed the super structure version in the server instance directory name
+		 * because it's possible to upgrade Phusion Passenger without changing the
+		 * web server's PID. This way each incompatible upgrade will use its own
+		 * server instance directory.
+		 */
+		string path = tempDir +
+			"/passenger." +
+			toString(ServerInstanceDir::DIR_STRUCTURE_MAJOR_VERSION) + "." +
+			toString(ServerInstanceDir::DIR_STRUCTURE_MINOR_VERSION) + "." +
+			toString<unsigned long long>(agentsOptions.getPid("web_server_pid"));
+		serverInstanceDir.reset(new ServerInstanceDir(path));
+	} else {
+		serverInstanceDir.reset(new ServerInstanceDir(agentsOptions.get("server_instance_dir")));
 		agentsOptions.set("server_instance_dir", serverInstanceDir->getPath());
-		agentsOptions.setInt("generation_number", generation->getNumber());
-		
-		UPDATE_TRACE_POINT();
-		ServerInstanceDirToucher serverInstanceDirToucher;
-		ResourceLocator resourceLocator(passengerRoot);
-		if (agentsOptions.get("analytics_server", false).empty()) {
-			// Using local, server instance specific logging agent.
-			loggingAgentAddress  = "unix:" + generation->getPath() + "/logging.socket";
-			loggingAgentPassword = randomGenerator->generateAsciiString(64);
-		} else {
-			// Using remote logging agent.
-			loggingAgentAddress = agentsOptions.get("analytics_server");
-		}
-		
-		UPDATE_TRACE_POINT();
-		shared_ptr<HelperAgentWatcher> helperAgentWatcher =
-			make_shared<HelperAgentWatcher>(resourceLocator);
-		shared_ptr<LoggingAgentWatcher> loggingAgentWatcher =
-			make_shared<LoggingAgentWatcher>(resourceLocator);
-		
-		UPDATE_TRACE_POINT();
-		vector<AgentWatcherPtr> watchers;
-		vector<AgentWatcherPtr>::iterator it;
-		watchers.push_back(helperAgentWatcher);
-		if (agentsOptions.get("analytics_server", false).empty()) {
-			watchers.push_back(loggingAgentWatcher);
-		}
-		
-		UPDATE_TRACE_POINT();
-		for (it = watchers.begin(); it != watchers.end(); it++) {
-			try {
-				(*it)->start();
-			} catch (const std::exception &e) {
-				writeArrayMessage(FEEDBACK_FD,
-					"Watchdog startup error",
-					e.what(),
-					NULL);
-				forceAllAgentsShutdown(watchers);
-				return 1;
-			}
-			// Allow other exceptions to propagate and crash the watchdog.
+	}
+	generation = serverInstanceDir->newGeneration(userSwitching, defaultUser,
+		defaultGroup, webServerWorkerUid, webServerWorkerGid);
+	agentsOptions.set("server_instance_dir", serverInstanceDir->getPath());
+	agentsOptions.setInt("generation_number", generation->getNumber());
+
+	UPDATE_TRACE_POINT();
+	serverInstanceDirToucher = new ServerInstanceDirToucher();
+
+	UPDATE_TRACE_POINT();
+	loggingAgentAddress  = "unix:" + generation->getPath() + "/logging";
+	loggingAgentPassword = randomGenerator->generateAsciiString(64);
+}
+
+static void
+initializeAgentWatchers() {
+	TRACE_POINT();
+	watchers.push_back(make_shared<HelperAgentWatcher>(*resourceLocator));
+	watchers.push_back(make_shared<LoggingAgentWatcher>(*resourceLocator));
+}
+
+static void
+startAgents() {
+	TRACE_POINT();
+	foreach (AgentWatcherPtr watcher, watchers) {
+		try {
+			watcher->start();
+		} catch (const std::exception &e) {
+			writeArrayMessage(FEEDBACK_FD,
+				"Watchdog startup error",
+				e.what(),
+				NULL);
+			forceAllAgentsShutdown(watchers);
+			exit(1);
 		}
-		UPDATE_TRACE_POINT();
-		for (it = watchers.begin(); it != watchers.end(); it++) {
-			try {
-				(*it)->startWatching();
-			} catch (const std::exception &e) {
-				writeArrayMessage(FEEDBACK_FD,
-					"Watchdog startup error",
-					e.what(),
-					NULL);
-				forceAllAgentsShutdown(watchers);
-				return 1;
-			}
-			// Allow other exceptions to propagate and crash the watchdog.
+		// Allow other exceptions to propagate and crash the watchdog.
+	}
+}
+
+static void
+startWatchingAgents() {
+	foreach (AgentWatcherPtr watcher, watchers) {
+		try {
+			watcher->startWatching();
+		} catch (const std::exception &e) {
+			writeArrayMessage(FEEDBACK_FD,
+				"Watchdog startup error",
+				e.what(),
+				NULL);
+			forceAllAgentsShutdown(watchers);
+			exit(1);
 		}
-		
-		UPDATE_TRACE_POINT();
+		// Allow other exceptions to propagate and crash the watchdog.
+	}
+}
+
+static void
+reportAgentsInformation() {
+	TRACE_POINT();
+	VariantMap report;
+
+	report
+		.set("server_instance_dir", serverInstanceDir->getPath())
+		.setInt("generation", generation->getNumber());
+
+	foreach (AgentWatcherPtr watcher, watchers) {
+		watcher->reportAgentsInformation(report);
+	}
+
+	report.writeToFd(FEEDBACK_FD, "Agents information");
+}
+
+int
+main(int argc, char *argv[]) {
+	initializeBareEssentials(argc, argv);
+	P_DEBUG("Starting Watchdog...");
+	
+	try {
+		TRACE_POINT();
+		initializeOptions();
+		initializeWorkingObjects();
+		initializeAgentWatchers();
+	} catch (const std::exception &e) {
 		writeArrayMessage(FEEDBACK_FD,
-			"Basic startup info",
-			serverInstanceDir->getPath().c_str(),
-			toString(generation->getNumber()).c_str(),
+			"Watchdog startup error",
+			e.what(),
 			NULL);
+		return 1;
+	}
+	// Allow other exceptions to propagate and crash the watchdog.
+
+	try {
+		TRACE_POINT();
+		startAgents();
+		startWatchingAgents();
+		reportAgentsInformation();
+		P_INFO("All Phusion Passenger agents started!");
 		
 		UPDATE_TRACE_POINT();
-		for (it = watchers.begin(); it != watchers.end(); it++) {
-			(*it)->sendStartupInfo(FEEDBACK_FD);
-		}
-		
-		UPDATE_TRACE_POINT();
-		writeArrayMessage(FEEDBACK_FD, "All agents started", NULL);
-		P_DEBUG("All Phusion Passenger agents started!");
-		
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
-		UPDATE_TRACE_POINT();
 		bool exitGracefully = waitForStarterProcessOrWatchers(watchers);
 		if (exitGracefully) {
 			/* Fork a child process which cleans up all the agent processes in
@@ -1199,7 +580,7 @@ main(int argc, char *argv[]) {
 		AgentWatcher::stopWatching(watchers);
 		if (exitGracefully) {
 			UPDATE_TRACE_POINT();
-			cleanupAgentsInBackground(watchers);
+			cleanupAgentsInBackground(watchers, argv);
 			return 0;
 		} else {
 			UPDATE_TRACE_POINT();
@@ -1209,8 +590,5 @@ main(int argc, char *argv[]) {
 	} catch (const tracable_exception &e) {
 		P_ERROR(e.what() << "\n" << e.backtrace());
 		return 1;
-	} catch (const std::exception &e) {
-		P_ERROR(e.what());
-		return 1;
 	}
 }