passenger 4.0.2 → 4.0.3

data/test/cxx/ServerInstanceDirTest.cpp

@@ -23,26 +23,11 @@ namespace tut {
 	
 	DEFINE_TEST_GROUP(ServerInstanceDirTest);
 	
-	TEST_METHOD(1) {
-		// The (pid_t, string) constructor creates a server instance directory
-		// in the given parent directory, and this server instance directory
-		// name contains the major and minor structure versions and the given PID.
-		ServerInstanceDir dir(1234, parentDir);
-		vector<string> contents = listDir(parentDir);
-		ensure_equals(contents.size(), 1u);
-		ensure_equals(contents[0],
-			"passenger." +
-			toString(ServerInstanceDir::DIR_STRUCTURE_MAJOR_VERSION) +
-			"." +
-			toString(ServerInstanceDir::DIR_STRUCTURE_MINOR_VERSION) +
-			".1234");
-	}
-	
 	TEST_METHOD(2) {
 		// The (string) constructor creates a ServerInstanceDir object that's
 		// associated with the given directory, and creates the directory
 		// if it doesn't exist.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir dir2(dir.getPath());
 		ServerInstanceDir dir3(parentDir + "/foo");
 		ensure_equals(dir2.getPath(), dir.getPath());
@@ -54,12 +39,12 @@ namespace tut {
 		// A ServerInstanceDir object removes the server instance directory
 		// upon destruction, but only if there are no more generations in it.
 		{
-			ServerInstanceDir dir(1234, parentDir);
+			ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		}
 		ensure_equals(listDir(parentDir).size(), 0u);
 		
 		{
-			ServerInstanceDir dir(1234, parentDir);
+			ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 			createGenerationDir(dir.getPath(), 1);
 		}
 		ensure_equals(listDir(parentDir).size(), 1u);
@@ -68,7 +53,7 @@ namespace tut {
 	TEST_METHOD(4) {
 		// The destructor does not throw any exceptions if the server instance
 		// directory doesn't exist anymore.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		removeDirTree(dir.getPath());
 	}
 	
@@ -77,8 +62,8 @@ namespace tut {
 		// wasn't created with the ownership flag or if it's been detached.
 		string path, path2;
 		{
-			ServerInstanceDir dir(1234, parentDir, false);
-			ServerInstanceDir dir2(5678, parentDir);
+			ServerInstanceDir dir(parentDir + "/passenger-test.1234", false);
+			ServerInstanceDir dir2(parentDir + "/passenger-test.5678", false);
 			dir2.detach();
 			path = dir.getPath();
 			path2 = dir2.getPath();
@@ -90,7 +75,7 @@ namespace tut {
 	TEST_METHOD(6) {
 		// If there are no existing generations, newGeneration() creates a new
 		// generation directory with number 0.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		unsigned int ncontents = listDir(dir.getPath()).size();
 		ServerInstanceDir::GenerationPtr generation = dir.newGeneration(true,
 			"nobody", nobodyGroup, 0, 0);
@@ -103,7 +88,7 @@ namespace tut {
 	TEST_METHOD(7) {
 		// A Generation object returned by newGeneration() deletes the associated
 		// generation directory upon destruction.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation = dir.newGeneration(true,
 			"nobody", nobodyGroup, 0, 0);
 		string path = generation->getPath();
@@ -113,7 +98,7 @@ namespace tut {
 	
 	TEST_METHOD(8) {
 		// getNewestGeneration() returns the newest generation.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation0 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr generation1 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr generation2 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
@@ -127,14 +112,14 @@ namespace tut {
 	
 	TEST_METHOD(9) {
 		// getNewestGeneration returns null if there are no generations.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ensure(dir.getNewestGeneration() == NULL);
 	}
 	
 	TEST_METHOD(10) {
 		// A Generation object returned by getNewestGeneration() doesn't delete
 		// the associated generation directory upon destruction.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr newestGeneration = dir.getNewestGeneration();
 		newestGeneration.reset();
@@ -143,7 +128,7 @@ namespace tut {
 	
 	TEST_METHOD(11) {
 		// getGeneration() returns the given generation.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation0 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr generation1 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr generation2 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
@@ -156,7 +141,7 @@ namespace tut {
 	TEST_METHOD(12) {
 		// A Generation object returned by getGeneration() doesn't delete the
 		// associated generation directory upon destruction.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation0 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		ServerInstanceDir::GenerationPtr generation1 = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		
@@ -169,7 +154,7 @@ namespace tut {
 	TEST_METHOD(13) {
 		// A detached Generation doesn't delete the associated generation
 		// directory upon destruction.
-		ServerInstanceDir dir(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
 		ServerInstanceDir::GenerationPtr generation = dir.newGeneration(true, "nobody", nobodyGroup, 0, 0);
 		string path = generation->getPath();
 		generation->detach();
@@ -180,7 +165,7 @@ namespace tut {
 	TEST_METHOD(14) {
 		// It's possible to have two ServerInstanceDir objects constructed
 		// with the same (pid_t, string) constructor arguments.
-		ServerInstanceDir dir1(1234, parentDir);
-		ServerInstanceDir dir2(1234, parentDir);
+		ServerInstanceDir dir(parentDir + "/passenger-test.1234");
+		ServerInstanceDir dir2(parentDir + "/passenger-test.1234");
 	}
 }

data/test/cxx/TestSupport.cpp

@@ -19,7 +19,8 @@ Json::Value testConfig;
 void createServerInstanceDirAndGeneration(ServerInstanceDirPtr &serverInstanceDir,
                                           ServerInstanceDir::GenerationPtr &generation)
 {
-	serverInstanceDir.reset(new ServerInstanceDir(getpid()));
+	string path = "/tmp/passenger-test." + toString(getpid());
+	serverInstanceDir.reset(new ServerInstanceDir(path));
 	generation = serverInstanceDir->newGeneration(geteuid() == 0,
 		"nobody", getPrimaryGroupName("nobody"),
 		geteuid(), getegid());

data/test/cxx/VariantMapTest.cpp

@@ -21,18 +21,15 @@ namespace tut {
 		// Test setting and getting string values.
 		map.set("hello", "world");
 		map.set("abcd", "efgh");
-		map.set("foo", "");
 		map.set("", "bar");
-		ensure_equals(map.get("hello"), "world");
-		ensure_equals(map.get("abcd"), "efgh");
-		ensure_equals(map.get("foo"), "");
-		ensure_equals(map.get(""), "bar");
-		ensure_equals(map.size(), 4u);
-		ensure(map.has("hello"));
-		ensure(map.has("abcd"));
-		ensure(map.has("foo"));
-		ensure(map.has(""));
-		ensure(!map.has("xyz"));
+		ensure_equals("(1)", map.get("hello"), "world");
+		ensure_equals("(2)", map.get("abcd"), "efgh");
+		ensure_equals("(3)", map.get(""), "bar");
+		ensure_equals("(4)", map.size(), 3u);
+		ensure("(5)", map.has("hello"));
+		ensure("(6)", map.has("abcd"));
+		ensure("(7)", map.has(""));
+		ensure("(8)", !map.has("xyz"));
 	}
 	
 	TEST_METHOD(3) {
@@ -176,4 +173,19 @@ namespace tut {
 		ensure_equals(map.get("foo"), "1234");
 		ensure_equals(map.get("bar"), "5678");
 	}
+
+	TEST_METHOD(7) {
+		// Setting an empty value result in the deletion of the key.
+		map.set("a", "a");
+		map.set("b", "b");
+		map.set("b", "");
+		try {
+			map.get("b");
+			fail("MissingKeyException expected");
+		} catch (const VariantMap::MissingKeyException &e) {
+			// Pass.
+		}
+		ensure(!map.has("foo"));
+		ensure_equals(map.size(), 1u);
+	}
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,7 +156,6 @@ files:
 - lib/phusion_passenger/utils/ansi_colors.rb
 - lib/phusion_passenger/utils/file_system_watcher.rb
 - lib/phusion_passenger/utils/hosts_file_parser.rb
-- lib/phusion_passenger/utils/robust_interruption.rb
 - lib/phusion_passenger/utils/tee_input.rb
 - lib/phusion_passenger/utils/tmpdir.rb
 - lib/phusion_passenger/utils/tmpio.rb
@@ -281,7 +280,11 @@ files:
 - ext/common/agents/LoggingAgent/FilterSupport.cpp
 - ext/common/agents/LoggingAgent/Main.cpp
 - ext/common/agents/SpawnPreparer.cpp
+- ext/common/agents/Watchdog/AgentWatcher.cpp
+- ext/common/agents/Watchdog/HelperAgentWatcher.cpp
+- ext/common/agents/Watchdog/LoggingAgentWatcher.cpp
 - ext/common/agents/Watchdog/Main.cpp
+- ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp
 - ext/common/AgentsStarter.cpp
 - ext/common/ApplicationPool2/AppTypes.cpp
 - ext/common/ApplicationPool2/Implementation.cpp
@@ -391,7 +394,6 @@ files:
 - ext/common/Utils/utf8.h
 - ext/common/Utils/VariantMap.h
 - ext/common/Utils.h
-- ext/common/AgentsStarter.hpp
 - ext/common/Utils/CachedFileStat.hpp
 - ext/common/ApplicationPool2/README.md
 - ext/apache2/Bucket.cpp
@@ -2223,6 +2225,7 @@ files:
 - resources/templates/nginx/confirm_extra_configure_flags.txt.erb
 - resources/templates/nginx/deployment_example.txt.erb
 - resources/templates/nginx/not_available_when_natively_packaged.txt.erb
+- resources/templates/nginx/pcre_checksum_could_not_be_verified.txt.erb
 - resources/templates/nginx/pcre_could_not_be_downloaded.txt.erb
 - resources/templates/nginx/pcre_could_not_be_extracted.txt.erb
 - resources/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb
@@ -2261,6 +2264,7 @@ files:
 - test/cxx/CachedFileStatTest.cpp
 - test/cxx/CxxTestMain.cpp
 - test/cxx/DechunkerTest.cpp
+- test/cxx/EventedBufferedInputTest.cpp
 - test/cxx/EventedClientTest.cpp
 - test/cxx/FileBackedPipeTest.cpp
 - test/cxx/FileChangeCheckerTest.cpp

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRiUovAAoJECrHRaUKISqM+WoIAIOplVMq6lTNkFzoNJ28RM8i
-OdBHR1+p7veJJBWyTQhNRGyi416rayEUZL8pRlaeak7688fdiJZ+6spYkZmAWsvp
-LSu1UGS70jeZamGFsdnrMk9d2zY0r8+kOsjDksZ2t4awTmASYuNRlfvglxF1HIan
-l0lffOJNXyBddrN315x5Lo0i8fWXjSahqXRgP+7ZU3+van8r5vK4UBeXGVTk8w2h
-MiOmf54mXFCq/Bg85FX7mS6Odxlu25+UkSm88nq5zTDS8C7OAlP295rE9bFBGFJ5
-63zXJEH/lcpFp3OisX4Sixz9wGiza7pmtQd9veQMwmlX/PtL3nME3NbXLlCkp5g=
-=gRq7
+iQEcBAABAgAGBQJRn9OxAAoJECrHRaUKISqM/UAH/282HhIyLkr616LFhFf7KWTQ
+OQnu9P8NlHQaUw/yJDZonQDMnMjlPuUYdgJ3xgqFEpLpcAspmJdhlO1G4z4jdhtV
+G5kTA9LCCuBAbpml0d17grFOEO/23VhJaNjU2uOQKnxS2Q6zVazffCj8AQwRugNc
+PXCshWCE909zln9HgpC3Rs+W0kJHGsrkX/lFHQPWQvVuTQYxYYBuHsafj+TcAzjg
+wB7TRZIsBV4SzGuaQDlmDhwDo38LEOHhg3d7wFej0sGaUaqmrBgcgBt8UKPI2nr5
+U43eiJEitSfaNxCtLtfIQDGxvSVcY2Qh2yJ/+L4UguStJbxlQ5dgNswD3P1yc5w=
+=zaV0
 -----END PGP SIGNATURE-----

data/ext/common/AgentsStarter.hpp

@@ -1,655 +0,0 @@
-/*
- *  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.
- */
-#ifndef _PASSENGER_AGENTS_STARTER_HPP_
-#define _PASSENGER_AGENTS_STARTER_HPP_
-
-#include <boost/function.hpp>
-#include <oxt/system_calls.hpp>
-#include <oxt/backtrace.hpp>
-#include <string>
-#include <vector>
-#include <set>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <Constants.h>
-#include <FileDescriptor.h>
-#include <MessageClient.h>
-#include <ServerInstanceDir.h>
-#include <Exceptions.h>
-#include <ResourceLocator.h>
-#include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/MessageIO.h>
-#include <Utils/Base64.h>
-#include <Utils/Timer.h>
-#include <Utils/ScopeGuard.h>
-#include <Utils/VariantMap.h>
-
-namespace Passenger {
-
-using namespace std;
-using namespace boost;
-using namespace oxt;
-
-/**
- * Utility class for starting various Phusion Passenger agents through the watchdog.
- */
-class AgentsStarter {
-public:
-	enum Type {
-		APACHE,
-		NGINX
-	};
-	
-private:
-	/** The watchdog's PID. Equals 0 if the watchdog hasn't been started yet
-	 * or if detach() is called. */
-	pid_t pid;
-	
-	Type type;
-	
-	/** The watchdog's feedback file descriptor. Only valid if pid != 0. */
-	FileDescriptor feedbackFd;
-	
-	/**
-	 * The helper agent's request socket filename. This socket only exists
-	 * for the Nginx helper agent, and it's for serving SCGI requests.
-	 *
-	 * Only valid if pid != 0.
-	 */
-	string requestSocketFilename;
-	
-	/**
-	 * A password for connecting to the request socket. Only valid if pid != 0.
-	 */
-	string requestSocketPassword;
-	
-	/**
-	 * The helper agent's message server socket filename, on which e.g. the
-	 * application pool server is listening. Only valid if pid != 0.
-	 *
-	 * The application pool server is available through the account "_web_server".
-	 */
-	string messageSocketFilename;
-	
-	/**
-	 * A password for the message server socket. The associated username is "_web_server".
-	 *
-	 * Only valid if pid != 0.
-	 */
-	string messageSocketPassword;
-	
-	bool loggingAgentRunningLocally;
-	string loggingSocketAddress;
-	string loggingSocketPassword;
-	
-	/**
-	 * The server instance dir of the agents. Only valid if pid != 0.
-	 */
-	ServerInstanceDirPtr serverInstanceDir;
-	
-	/**
-	 * The generation dir of the agents. Only valid if pid != 0.
-	 */
-	ServerInstanceDir::GenerationPtr generation;
-	
-	/**
-	 * Safely dup2() the given file descriptor to 3 (FEEDBACK_FD).
-	 */
-	void installFeedbackFd(const FileDescriptor &fd) {
-		if (fd != FEEDBACK_FD && syscalls::dup2(fd, FEEDBACK_FD) == -1) {
-			int e = errno;
-			try {
-				writeArrayMessage(fd,
-					"system error",
-					"dup2() failed",
-					toString(e).c_str(),
-					NULL);
-				_exit(1);
-			} catch (...) {
-				fprintf(stderr, "Passenger AgentsStarter: dup2() failed: %s (%d)\n",
-					strerror(e), e);
-				fflush(stderr);
-				_exit(1);
-			}
-		}
-	}
-	
-	/**
-	 * Call this if the watchdog seems to have crashed. This function will try
-	 * to determine whether the watchdog is still running, whether it crashed
-	 * with a signal, etc. If it has detected that the watchdog is no longer running
-	 * then it will set <em>pid</em> to -1.
-	 */
-	void inspectWatchdogCrashReason(pid_t &pid) {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		int ret, status;
-		
-		/* Upon noticing that something went wrong, the watchdog
-		 * or its subprocesses might still be writing out an error
-		 * report, so we wait a while before killing the watchdog.
-		 */
-		ret = timedWaitPid(pid, &status, 5000);
-		if (ret == 0) {
-			/* Looks like the watchdog didn't crash and is still running. */
-			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
-				"it froze during startup and reported an unknown error");
-		} else if (ret != -1 && WIFSIGNALED(status)) {
-			/* Looks like a crash which caused a signal. */
-			pid = -1;
-			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
-				"it seems to have been killed with signal " +
-				getSignalName(WTERMSIG(status)) + " during startup");
-		} else if (ret == -1) {
-			/* Looks like it exited for a different reason and has no exit code. */
-			pid = -1;
-			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
-				"it seems to have crashed during startup for an unknown reason");
-		} else {
-			/* Looks like it exited for a different reason, but has an exit code. */
-			pid = -1;
-			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
-				"it seems to have crashed during startup for an unknown reason, "
-				"with exit code " + toString(WEXITSTATUS(status)));
-		}
-	}
-	
-	static void killProcessGroupAndWait(pid_t *pid, unsigned long long timeout = 0) {
-		if (*pid != -1 && (timeout == 0 || timedWaitPid(*pid, NULL, timeout) <= 0)) {
-			this_thread::disable_syscall_interruption dsi;
-			syscalls::killpg(*pid, SIGKILL);
-			syscalls::waitpid(*pid, NULL, 0);
-			*pid = -1;
-		}
-	}
-	
-	/**
-	 * 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
-	}
-	
-	/**
-	 * Gracefully shutdown an agent process by sending an exit command to its socket.
-	 * Returns whether the agent has successfully processed the exit command.
-	 * Any exceptions are caught and will cause false to be returned.
-	 */
-	bool gracefullyShutdownAgent(const string &socketFilename, const string &username,
-	                             const string &password
-	) {
-		try {
-			MessageClient client;
-			vector<string> args;
-			
-			client.connect("unix:" + socketFilename, username, password);
-			client.write("exit", NULL);
-			return client.read(args) && args[0] == "Passed security" &&
-			       client.read(args) && args[0] == "exit command received";
-		} catch (const SystemException &) {
-		} catch (const IOException &) {
-		} catch (const SecurityException &) {
-		}
-		return false;
-	}
-	
-	string serializePrestartURLs(const set<string> &prestartURLs) const {
-		set<string>::const_iterator it;
-		string result;
-		
-		for (it = prestartURLs.begin(); it != prestartURLs.end(); it++) {
-			result.append(*it);
-			result.append(1, '\0');
-		}
-		return Base64::encode(result);
-	}
-	
-public:
-	/**
-	 * Construct a AgentsStarter object. The watchdog and the agents
-	 * aren't started yet until you call start().
-	 *
-	 * @param type Whether one wants to start the Apache or the Nginx helper agent.
-	 */
-	AgentsStarter(Type type) {
-		pid = 0;
-		loggingAgentRunningLocally = false;
-		this->type = type;
-	}
-	
-	~AgentsStarter() {
-		if (pid != 0) {
-			this_thread::disable_syscall_interruption dsi;
-			bool cleanShutdown = gracefullyShutdownAgent(messageSocketFilename,
-				"_web_server", messageSocketPassword);
-			if (loggingAgentRunningLocally) {
-				string filename = parseUnixSocketAddress(loggingSocketAddress);
-				cleanShutdown = cleanShutdown &&
-					gracefullyShutdownAgent(filename,
-						"logging", loggingSocketPassword);
-			}
-			
-			/* Send a message down the feedback fd to tell the watchdog
-			 * Whether this is a clean shutdown. Closing the fd without
-			 * sending anything also indicates an unclean shutdown,
-			 * but we send a byte anyway in case there are other processes
-			 * who have the fd open.
-			 */
-			if (cleanShutdown) {
-				syscalls::write(feedbackFd, "c", 1);
-			} else {
-				syscalls::write(feedbackFd, "u", 1);
-			}
-			
-			/* If we failed to send an exit command to one of the agents then we have
-			 * to forcefully kill all agents now because otherwise one of them might
-			 * never exit. We do this by closing the feedback fd without sending a
-			 * random byte, to indicate that this is an abnormal shutdown. The watchdog
-			 * will then kill all agents.
-			 */
-			
-			feedbackFd.close();
-			syscalls::waitpid(pid, NULL, 0);
-		}
-	}
-	
-	/**
-	 * Returns the type as was passed to the constructor.
-	 */
-	Type getType() const {
-		return type;
-	}
-	
-	/**
-	 * Returns the watchdog's PID. Equals 0 if the watchdog hasn't been started yet
-	 * or if detach() is called.
-	 */
-	pid_t getPid() const {
-		return pid;
-	}
-	
-	/**
-	 * The helper agent's request socket filename, on which it's listening
-	 * for SCGI requests.
-	 *
-	 * @pre getPid() != 0 && getType() == NGINX
-	 */
-	string getRequestSocketFilename() const {
-		return requestSocketFilename;
-	}
-	
-	/**
-	 * Returns the password for connecting to the request socket.
-	 *
-	 * @pre getPid() != 0 && getType() == NGINX
-	 */
-	string getRequestSocketPassword() const {
-		return requestSocketPassword;
-	}
-	
-	string getMessageSocketFilename() const {
-		return messageSocketFilename;
-	}
-	
-	string getMessageSocketPassword() const {
-		return messageSocketPassword;
-	}
-	
-	string getLoggingSocketAddress() const {
-		return loggingSocketAddress;
-	}
-	
-	string getLoggingSocketPassword() const {
-		return loggingSocketPassword;
-	}
-	
-	/**
-	 * Returns the server instance dir of the agents.
-	 *
-	 * @pre getPid() != 0
-	 */
-	ServerInstanceDirPtr getServerInstanceDir() const {
-		return serverInstanceDir;
-	}
-	
-	/**
-	 * Returns the generation dir of the agents.
-	 *
-	 * @pre getPid() != 0
-	 */
-	ServerInstanceDir::GenerationPtr getGeneration() const {
-		return generation;
-	}
-	
-	/**
-	 * Start the agents through the watchdog, with the given parameters.
-	 *
-	 * @throws SystemException Something went wrong.
-	 * @throws IOException Something went wrong while communicating with one
-	 *                     of the agents during its initialization phase.
-	 * @throws RuntimeException Something went wrong.
-	 */
-	void start(int logLevel, const string &debugLogFile,
-	           pid_t webServerPid, const string &tempDir,
-	           bool userSwitching, const string &defaultUser, const string &defaultGroup,
-	           uid_t webServerWorkerUid, gid_t webServerWorkerGid,
-	           const string &passengerRoot, const string &defaultRubyCommand,
-	           unsigned int maxPoolSize, unsigned int maxInstancesPerApp,
-	           unsigned int poolIdleTime,
-	           const string &analyticsServer,
-	           const string &analyticsLogUser,
-	           const string &analyticsLogGroup,
-	           const string &unionStationGatewayAddress,
-	           unsigned short unionStationGatewayPort,
-	           const string &unionStationGatewayCert,
-	           const string &unionStationProxyAddress,
-	           const set<string> &prestartURLs,
-	           const function<void ()> &afterFork = function<void ()>())
-	{
-		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		ResourceLocator locator(passengerRoot);
-		
-		string realUnionStationGatewayCert;
-		if (unionStationGatewayCert.empty()) {
-			realUnionStationGatewayCert = locator.getResourcesDir() + "/union_station_gateway.crt";
-		} else if (unionStationGatewayCert != "-") {
-			realUnionStationGatewayCert = unionStationGatewayCert;
-		}
-		string watchdogFilename = locator.getAgentsDir() + "/PassengerWatchdog";
-		
-		VariantMap watchdogArgs;
-		watchdogArgs
-			.set    ("web_server_type", type == APACHE ? "apache" : "nginx")
-			.setInt ("log_level",       logLevel)
-			.set    ("debug_log_file",  debugLogFile)
-			.setPid ("web_server_pid",  webServerPid)
-			.set    ("temp_dir",        tempDir.empty() ? getSystemTempDir() : tempDir)
-			.setBool("user_switching",  userSwitching)
-			.set    ("default_user",    defaultUser)
-			.set    ("default_group",   defaultGroup)
-			.setUid ("web_server_worker_uid", webServerWorkerUid)
-			.setGid ("web_server_worker_gid", webServerWorkerGid)
-			.set    ("passenger_root",  passengerRoot)
-			.set    ("default_ruby",    defaultRubyCommand)
-			.setInt ("max_pool_size",   maxPoolSize)
-			.setInt ("max_instances_per_app",     maxInstancesPerApp)
-			.setInt ("pool_idle_time",            poolIdleTime)
-			.set    ("analytics_server",          analyticsServer)
-			.set    ("analytics_log_user",        analyticsLogUser)
-			.set    ("analytics_log_group",       analyticsLogGroup)
-			.set    ("union_station_gateway_address",  unionStationGatewayAddress)
-			.setInt ("union_station_gateway_port", unionStationGatewayPort)
-			.set    ("union_station_gateway_cert", realUnionStationGatewayCert)
-			.set    ("union_station_proxy_address", unionStationProxyAddress)
-			.set    ("prestart_urls",   serializePrestartURLs(prestartURLs));
-		
-		SocketPair fds;
-		int e;
-		pid_t pid;
-		
-		fds = createUnixSocketPair();
-		pid = syscalls::fork();
-		if (pid == 0) {
-			// Child
-			
-			/* Become the session leader so that Apache can't kill the
-			 * watchdog with killpg() during shutdown, so that a
-			 * Ctrl-C only affects the web server, and so that
-			 * we can kill all of our subprocesses in a single killpg().
-			 */
-			setsid();
-			
-			// Make sure the feedback fd is 3 and close all file descriptors
-			// except stdin, stdout, stderr and 3.
-			syscalls::close(fds[0]);
-			installFeedbackFd(fds[1]);
-			closeAllFileDescriptors(FEEDBACK_FD);
-			
-			/* We don't know how the web server or the environment affect
-			 * signal handlers and the signal mask, so reset this stuff
-			 * just in case.
-			 */
-			resetSignalHandlersAndMask();
-			
-			if (afterFork) {
-				afterFork();
-			}
-			
-			execl(watchdogFilename.c_str(), "PassengerWatchdog", (char *) 0);
-			e = errno;
-			try {
-				writeArrayMessage(FEEDBACK_FD,
-					"exec error",
-					toString(e).c_str(),
-					NULL);
-				_exit(1);
-			} catch (...) {
-				fprintf(stderr, "Passenger AgentsStarter: could not execute %s: %s (%d)\n",
-					watchdogFilename.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
-			UPDATE_TRACE_POINT();
-			FileDescriptor feedbackFd = fds[0];
-			vector<string> args;
-			bool result, allAgentsStarted;
-			
-			ServerInstanceDirPtr serverInstanceDir;
-			ServerInstanceDir::GenerationPtr generation;
-			ScopeGuard guard(boost::bind(&AgentsStarter::killProcessGroupAndWait, &pid, 0));
-			fds[1].close();
-			
-			
-			/****** Send arguments to watchdog through the feedback channel ******/
-			
-			UPDATE_TRACE_POINT();
-			/* Here we don't care about EPIPE and ECONNRESET errors. The watchdog
-			 * could have sent an error message over the feedback fd without
-			 * reading the arguments. We'll notice that later.
-			 */
-			try {
-				watchdogArgs.writeToFd(feedbackFd);
-			} catch (const SystemException &e) {
-				if (e.code() != EPIPE && e.code() != ECONNRESET) {
-					inspectWatchdogCrashReason(pid);
-				}
-			}
-			
-			
-			/****** Read basic startup information ******/
-			
-			this_thread::restore_interruption ri(di);
-			this_thread::restore_syscall_interruption rsi(dsi);
-			UPDATE_TRACE_POINT();
-			
-			try {
-				result = readArrayMessage(feedbackFd, args);
-			} catch (const SystemException &ex) {
-				if (ex.code() == ECONNRESET) {
-					inspectWatchdogCrashReason(pid);
-				} else {
-					killProcessGroupAndWait(&pid, 5000);
-					guard.clear();
-					throw SystemException("Unable to start the Phusion Passenger watchdog: "
-						"unable to read its startup information",
-						ex.code());
-				}
-			}
-			if (!result) {
-				UPDATE_TRACE_POINT();
-				inspectWatchdogCrashReason(pid);
-			}
-			
-			UPDATE_TRACE_POINT();
-			if (args[0] == "Basic startup info") {
-				if (args.size() == 3) {
-					serverInstanceDir.reset(new ServerInstanceDir(args[1], false));
-					generation = serverInstanceDir->getGeneration(atoi(args[2]));
-				} else {
-					throw IOException("Unable to start the Phusion Passenger watchdog: "
-						"it returned an invalid basic startup information message");
-				}
-			} else if (args[0] == "Watchdog startup error") {
-				killProcessGroupAndWait(&pid, 5000);
-				guard.clear();
-				throw RuntimeException("Unable to start the Phusion Passenger watchdog "
-					"because it encountered the following error during startup: " +
-					args[1]);
-			} else if (args[0] == "system error") {
-				killProcessGroupAndWait(&pid, 5000);
-				guard.clear();
-				throw SystemException(args[1], atoi(args[2]));
-			} else if (args[0] == "exec error") {
-				e = atoi(args[1]);
-				killProcessGroupAndWait(&pid, 5000);
-				guard.clear();
-				if (e == ENOENT) {
-					string passengerRootConfig;
-					if (type == APACHE) {
-						passengerRootConfig = "PassengerRoot";
-					} else {
-						passengerRootConfig = "passenger_root";
-					}
-					throw RuntimeException("Unable to start the Phusion Passenger watchdog "
-						"because its executable (" + watchdogFilename + ") does "
-						"not exist. This probably means that your Phusion Passenger "
-						"installation is broken or incomplete, or that your '" +
-						passengerRootConfig + "' directive is set to the wrong value. "
-						"Please reinstall Phusion Passenger or fix your '" +
-						passengerRootConfig + "' directive, whichever is applicable.");
-				} else {
-					throw SystemException("Unable to start the Phusion Passenger watchdog (" +
-						watchdogFilename + ")", e);
-				}
-			}
-			
-			
-			/****** Read agents startup information ******/
-			
-			UPDATE_TRACE_POINT();
-			allAgentsStarted = false;
-			
-			while (!allAgentsStarted) {
-				try {
-					UPDATE_TRACE_POINT();
-					result = readArrayMessage(feedbackFd, args);
-				} catch (const SystemException &ex) {
-					killProcessGroupAndWait(&pid, 5000);
-					guard.clear();
-					throw SystemException("Unable to start the Phusion Passenger watchdog: "
-						"unable to read all agent startup information",
-						ex.code());
-				}
-				if (!result) {
-					UPDATE_TRACE_POINT();
-					inspectWatchdogCrashReason(pid);
-				}
-				
-				if (args[0] == "HelperAgent info") {
-					UPDATE_TRACE_POINT();
-					if (args.size() == 5) {
-						this->pid = pid;
-						this->feedbackFd = feedbackFd;
-						requestSocketFilename   = args[1];
-						requestSocketPassword   = Base64::decode(args[2]);
-						messageSocketFilename   = args[3];
-						messageSocketPassword   = Base64::decode(args[4]);
-						this->serverInstanceDir = serverInstanceDir;
-						this->generation        = generation;
-					} else {
-						killProcessGroupAndWait(&pid, 5000);
-						guard.clear();
-						throw IOException("Unable to start the Phusion Passenger watchdog: "
-							"it returned an invalid initialization feedback message");
-					}
-				} else if (args[0] == "LoggingServer info") {
-					UPDATE_TRACE_POINT();
-					if (args.size() == 3) {
-						loggingAgentRunningLocally = true;
-						loggingSocketAddress  = args[1];
-						loggingSocketPassword = args[2];
-					} else {
-						killProcessGroupAndWait(&pid, 5000);
-						guard.clear();
-						throw IOException("Unable to start the Phusion Passenger watchdog: "
-							"it returned an invalid initialization feedback message");
-					}
-				} else if (args[0] == "All agents started") {
-					allAgentsStarted = true;
-				} else {
-					UPDATE_TRACE_POINT();
-					killProcessGroupAndWait(&pid, 5000);
-					guard.clear();
-					throw RuntimeException("One of the Passenger agents sent an unknown feedback message '" + args[0] + "'");
-				}
-			}
-			
-			guard.clear();
-		}
-	}
-	
-	/**
-	 * Close any file descriptors that this object has, and make it so that the destructor
-	 * doesn't try to shut down the agents.
-	 *
-	 * @post getPid() == 0
-	 */
-	void detach() {
-		feedbackFd.close();
-		pid = 0;
-	}
-};
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_AGENTS_STARTER_HPP_ */