passenger 1.0.5 → 2.0.1

data/ext/apache2/Hooks.h

@@ -2,6 +2,8 @@
  *  Phusion Passenger - http://www.modrails.com/
  *  Copyright (C) 2008  Phusion
  *
+ *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; version 2 of the License.

data/ext/apache2/Logging.cpp

@@ -2,6 +2,8 @@
  *  Phusion Passenger - http://www.modrails.com/
  *  Copyright (C) 2008  Phusion
  *
+ *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; version 2 of the License.
@@ -21,10 +23,20 @@
 
 namespace Passenger {
 
-int _debugLevel = 2;
+unsigned int _logLevel = 0;
 ostream *_logStream = &cerr;
 ostream *_debugStream = &cerr;
 
+unsigned int
+getLogLevel() {
+	return _logLevel;
+}
+
+void
+setLogLevel(unsigned int value) {
+	_logLevel = value;
+}
+
 void
 setDebugFile(const char *logFile) {
 	#ifdef PASSENGER_DEBUG

data/ext/apache2/Logging.h

@@ -2,6 +2,8 @@
  *  Phusion Passenger - http://www.modrails.com/
  *  Copyright (C) 2008  Phusion
  *
+ *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; version 2 of the License.
@@ -19,17 +21,21 @@
 #define _PASSENGER_LOGGING_H_
 
 #include <sys/types.h>
+#include <sys/time.h>
 #include <unistd.h>
 #include <ostream>
+#include <ctime>
 
 namespace Passenger {
 
 using namespace std;
 
-extern int _debugLevel;
+extern unsigned int _logLevel;
 extern ostream *_logStream;
 extern ostream *_debugStream;
 
+unsigned int getLogLevel();
+void setLogLevel(unsigned int value);
 void setDebugFile(const char *logFile = NULL);
 
 /**
@@ -38,9 +44,16 @@ void setDebugFile(const char *logFile = NULL);
 #define P_LOG(expr) \
 	do { \
 		if (Passenger::_logStream != 0) { \
+			time_t the_time = time(NULL); \
+			struct tm *the_tm = localtime(&the_time); \
+			char datetime_buf[60]; \
+			struct timeval tv; \
+			strftime(datetime_buf, sizeof(datetime_buf), "%x %H:%M:%S", the_tm); \
+			gettimeofday(&tv, NULL); \
 			*Passenger::_logStream << \
-				"[" << getpid() << ":" << __FILE__ << ":" << __LINE__ << "] " << \
-				expr << std::endl; \
+				"[ pid=" << getpid() << " file=" << __FILE__ << ":" << __LINE__ << \
+				" time=" << datetime_buf << "." << (tv.tv_usec / 1000) << " ]:" << \
+				"\n  " << expr << std::endl; \
 		} \
 	} while (false)
 
@@ -65,16 +78,33 @@ void setDebugFile(const char *logFile = NULL);
 #ifdef PASSENGER_DEBUG
 	#define P_TRACE(level, expr) \
 		do { \
-			if (Passenger::_debugLevel >= level) { \
+			if (Passenger::_logLevel >= level) { \
 				if (Passenger::_debugStream != 0) { \
+					time_t the_time = time(NULL); \
+					struct tm *the_tm = localtime(&the_time); \
+					char datetime_buf[60]; \
+					struct timeval tv; \
+					strftime(datetime_buf, sizeof(datetime_buf), "%x %H:%M:%S", the_tm); \
+					gettimeofday(&tv, NULL); \
 					*Passenger::_debugStream << \
-						"[" << getpid() << ":" << __FILE__ << ":" << __LINE__ << "] " << \
-						expr << std::endl; \
+						"[ pid=" << getpid() << " file=" << __FILE__ << ":" << __LINE__ << \
+						" time=" << datetime_buf << "." << (tv.tv_usec / 1000) << " ]:" << \
+						"\n  " << expr << std::endl; \
 				} \
 			} \
 		} while (false)
+	
+	#define P_ASSERT(expr, result_if_failed, message) \
+		do { \
+			if (!(expr)) { \
+				P_ERROR("Assertion failed: " << message); \
+				return result_if_failed; \
+			} \
+		} while (false)
 #else
 	#define P_TRACE(level, expr) do { /* nothing */ } while (false)
+	
+	#define P_ASSERT(expr, result_if_failed, message) do { /* nothing */ } while (false)
 #endif
 
 } // namespace Passenger

data/ext/apache2/MessageChannel.h

@@ -2,6 +2,8 @@
  *  Phusion Passenger - http://www.modrails.com/
  *  Copyright (C) 2008  Phusion
  *
+ *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; version 2 of the License.
@@ -30,6 +32,7 @@
 #include <unistd.h>
 #include <cstdarg>
 
+#include "System.h"
 #include "Exceptions.h"
 #include "Utils.h"
 
@@ -88,7 +91,7 @@ using namespace std;
  *    receive a message, then a file descriptor, then a scalar. If the
  *    receiving side does things in the wrong order then bad things will
  *    happen.
- * @note MessageChannel is thread-safe.
+ * @note MessageChannel is not thread-safe, but is reentrant.
  *
  * @ingroup Support
  */
@@ -118,10 +121,16 @@ public:
 	/**
 	 * Close the underlying file descriptor. If this method is called multiple
 	 * times, the file descriptor will only be closed the first time.
+	 *
+	 * @throw SystemException
+	 * @throw boost::thread_interrupted
 	 */
 	void close() {
 		if (fd != -1) {
-			::close(fd);
+			int ret = InterruptableCalls::close(fd);
+			if (ret == -1) {
+				throw SystemException("Cannot close file descriptor", errno);
+			}
 			fd = -1;
 		}
 	}
@@ -132,6 +141,7 @@ public:
 	 *
 	 * @param args The message elements.
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
 	 * @see read(), write(const char *, ...)
 	 */
@@ -162,6 +172,7 @@ public:
 	 * @param ... Other elements of the message. These *must* be strings, i.e. of type char*.
 	 *            It is also required to terminate this list with a NULL.
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @pre None of the message elements may contain a NUL character (<tt>'\\0'</tt>).
 	 * @see read(), write(const list<string> &)
 	 */
@@ -188,6 +199,7 @@ public:
 	 *
 	 * @param str The scalar message's content.
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @see readScalar(), writeScalar(const char *, unsigned int)
 	 */
 	void writeScalar(const string &str) {
@@ -201,6 +213,7 @@ public:
 	 * @param size The number of bytes in <tt>data</tt>.
 	 * @pre <tt>data != NULL</tt>
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @see readScalar(), writeScalar(const string &)
 	 */
 	void writeScalar(const char *data, unsigned int size) {
@@ -217,15 +230,14 @@ public:
 	 * @param size The number of bytes in <tt>data</tt>.
 	 * @pre <tt>data != NULL</tt>
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @see readRaw()
 	 */
 	void writeRaw(const char *data, unsigned int size) {
 		ssize_t ret;
 		unsigned int written = 0;
 		do {
-			do {
-				ret = ::write(fd, data + written, size - written);
-			} while (ret == -1 && errno == EINTR);
+			ret = InterruptableCalls::write(fd, data + written, size - written);
 			if (ret == -1) {
 				throw SystemException("write() failed", errno);
 			} else {
@@ -241,6 +253,7 @@ public:
 	 * @param data The data to send.
 	 * @pre <tt>data != NULL</tt>
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 */
 	void writeRaw(const string &data) {
 		writeRaw(data.c_str(), data.size());
@@ -252,6 +265,7 @@ public:
 	 *
 	 * @param fileDescriptor The file descriptor to pass.
 	 * @throws SystemException Something went wrong during file descriptor passing.
+	 * @throws boost::thread_interrupted
 	 * @pre <tt>fileDescriptor >= 0</tt>
 	 * @see readFileDescriptor()
 	 */
@@ -268,6 +282,7 @@ public:
 			char control_data[CMSG_SPACE(sizeof(int))];
 		#endif
 		struct cmsghdr *control_header;
+		int ret;
 	
 		msg.msg_name = NULL;
 		msg.msg_namelen = 0;
@@ -294,7 +309,8 @@ public:
 			memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
 		#endif
 		
-		if (sendmsg(fd, &msg, 0) == -1) {
+		ret = InterruptableCalls::sendmsg(fd, &msg, 0);
+		if (ret == -1) {
 			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
 		}
 	}
@@ -306,6 +322,7 @@ public:
 	 * @return Whether end-of-file has been reached. If so, then the contents
 	 *         of <tt>args</tt> will be undefined.
 	 * @throws SystemException If an error occured while receiving the message.
+	 * @throws boost::thread_interrupted
 	 * @see write()
 	 */
 	bool read(vector<string> &args) {
@@ -314,9 +331,7 @@ public:
 		unsigned int alreadyRead = 0;
 		
 		do {
-			do {
-				ret = ::read(fd, (char *) &size + alreadyRead, sizeof(size) - alreadyRead);
-			} while (ret == -1 && errno == EINTR);
+			ret = InterruptableCalls::read(fd, (char *) &size + alreadyRead, sizeof(size) - alreadyRead);
 			if (ret == -1) {
 				throw SystemException("read() failed", errno);
 			} else if (ret == 0) {
@@ -331,9 +346,7 @@ public:
 		buffer.reserve(size);
 		while (buffer.size() < size) {
 			char tmp[1024 * 8];
-			do {
-				ret = ::read(fd, tmp, min(size - buffer.size(), sizeof(tmp)));
-			} while (ret == -1 && errno == EINTR);
+			ret = InterruptableCalls::read(fd, tmp, min(size - buffer.size(), sizeof(tmp)));
 			if (ret == -1) {
 				throw SystemException("read() failed", errno);
 			} else if (ret == 0) {
@@ -359,6 +372,7 @@ public:
 	 * @param output The message will be put in here.
 	 * @returns Whether end-of-file was reached during reading.
 	 * @throws SystemException An error occured while writing the data to the file descriptor.
+	 * @throws boost::thread_interrupted
 	 * @see writeScalar()
 	 */
 	bool readScalar(string &output) {
@@ -399,6 +413,7 @@ public:
 	 * @return Whether reading was successful or whether EOF was reached.
 	 * @pre buf != NULL
 	 * @throws SystemException Something went wrong during reading.
+	 * @throws boost::thread_interrupted
 	 * @see writeRaw()
 	 */
 	bool readRaw(void *buf, unsigned int size) {
@@ -406,9 +421,7 @@ public:
 		unsigned int alreadyRead = 0;
 		
 		while (alreadyRead < size) {
-			do {
-				ret = ::read(fd, (char *) buf + alreadyRead, size - alreadyRead);
-			} while (ret == -1 && errno == EINTR);
+			ret = InterruptableCalls::read(fd, (char *) buf + alreadyRead, size - alreadyRead);
 			if (ret == -1) {
 				throw SystemException("read() failed", errno);
 			} else if (ret == 0) {
@@ -430,6 +443,7 @@ public:
 	 *            file descriptor isn't a Unix socket.
 	 * @throws IOException Whatever was received doesn't seem to be a
 	 *            file descriptor.
+	 * @throws boost::thread_interrupted
 	 */
 	int readFileDescriptor() {
 		struct msghdr msg;
@@ -448,6 +462,7 @@ public:
 			#define EXPECTED_CMSG_LEN CMSG_LEN(sizeof(int))
 		#endif
 		struct cmsghdr *control_header;
+		int ret;
 
 		msg.msg_name    = NULL;
 		msg.msg_namelen = 0;
@@ -462,7 +477,8 @@ public:
 		msg.msg_controllen = sizeof(control_data);
 		msg.msg_flags      = 0;
 		
-		if (recvmsg(fd, &msg, 0) == -1) {
+		ret = InterruptableCalls::recvmsg(fd, &msg, 0);
+		if (ret == -1) {
 			throw SystemException("Cannot read file descriptor with recvmsg()", errno);
 		}
 		

data/ext/apache2/SpawnManager.h

@@ -2,6 +2,8 @@
  *  Phusion Passenger - http://www.modrails.com/
  *  Copyright (C) 2008  Phusion
  *
+ *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; version 2 of the License.
@@ -21,7 +23,7 @@
 #include <string>
 #include <list>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -32,14 +34,13 @@
 #include <unistd.h>
 #include <errno.h>
 #include <pwd.h>
-#ifdef TESTING_SPAWN_MANAGER
-	#include <signal.h>
-#endif
+#include <signal.h>
 
 #include "Application.h"
 #include "MessageChannel.h"
 #include "Exceptions.h"
 #include "Logging.h"
+#include "System.h"
 
 namespace Passenger {
 
@@ -47,10 +48,10 @@ using namespace std;
 using namespace boost;
 
 /**
- * @brief Spawning of Ruby on Rails application instances.
+ * @brief Spawning of Ruby on Rails/Rack application instances.
  *
- * This class is responsible for spawning new instances of Ruby on Rails applications.
- * Use the spawn() method to do so.
+ * This class is responsible for spawning new instances of Ruby on Rails or
+ * Rack applications. Use the spawn() method to do so.
  *
  * @note This class is fully thread-safe.
  *
@@ -85,7 +86,6 @@ private:
 
 	string spawnServerCommand;
 	string logFile;
-	string environment;
 	string rubyCommand;
 	string user;
 	
@@ -98,6 +98,7 @@ private:
 	/**
 	 * Restarts the spawn server.
 	 *
+	 * @pre System call interruption is disabled.
 	 * @throws SystemException An error occured while trying to setup the spawn server.
 	 * @throws IOException The specified log file could not be opened.
 	 */
@@ -108,24 +109,24 @@ private:
 			// Wait at most 5 seconds for the spawn server to exit.
 			// If that doesn't work, kill it, then wait at most 5 seconds
 			// for it to exit.
-			time_t begin = time(NULL);
+			time_t begin = InterruptableCalls::time(NULL);
 			bool done = false;
-			while (!done && time(NULL) - begin < 5) {
-				if (waitpid(pid, NULL, WNOHANG) > 0) {
+			while (!done && InterruptableCalls::time(NULL) - begin < 5) {
+				if (InterruptableCalls::waitpid(pid, NULL, WNOHANG) > 0) {
 					done = true;
 				} else {
-					usleep(100000);
+					InterruptableCalls::usleep(100000);
 				}
 			}
 			if (!done) {
 				P_TRACE(2, "Spawn server did not exit in time, killing it...");
-				kill(pid, SIGTERM);
-				begin = time(NULL);
-				while (time(NULL) - begin < 5) {
-					if (waitpid(pid, NULL, WNOHANG) > 0) {
+				InterruptableCalls::kill(pid, SIGTERM);
+				begin = InterruptableCalls::time(NULL);
+				while (InterruptableCalls::time(NULL) - begin < 5) {
+					if (InterruptableCalls::waitpid(pid, NULL, WNOHANG) > 0) {
 						break;
 					} else {
-						usleep(100000);
+						InterruptableCalls::usleep(100000);
 					}
 				}
 				P_TRACE(2, "Spawn server has exited.");
@@ -137,11 +138,11 @@ private:
 		FILE *logFileHandle = NULL;
 		
 		serverNeedsRestart = true;
-		if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
+		if (InterruptableCalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
 			throw SystemException("Cannot create a Unix socket", errno);
 		}
 		if (!logFile.empty()) {
-			logFileHandle = fopen(logFile.c_str(), "a");
+			logFileHandle = InterruptableCalls::fopen(logFile.c_str(), "a");
 			if (logFileHandle == NULL) {
 				string message("Cannot open log file '");
 				message.append(logFile);
@@ -150,23 +151,18 @@ private:
 			}
 		}
 
-		pid = fork();
+		pid = InterruptableCalls::fork();
 		if (pid == 0) {
 			if (!logFile.empty()) {
 				dup2(fileno(logFileHandle), STDERR_FILENO);
 				fclose(logFileHandle);
 			}
 			dup2(STDERR_FILENO, STDOUT_FILENO);
-			if (!environment.empty()) {
-				setenv("RAILS_ENV", environment.c_str(), true);
-			}
 			dup2(fds[1], SPAWN_SERVER_INPUT_FD);
 			
 			// Close all unnecessary file descriptors
-			for (long i = sysconf(_SC_OPEN_MAX) - 1; i >= 0; i--) {
-				if (i > SPAWN_SERVER_INPUT_FD) {
-					close(i);
-				}
+			for (long i = sysconf(_SC_OPEN_MAX) - 1; i > SPAWN_SERVER_INPUT_FD; i--) {
+				close(i);
 			}
 			
 			if (!user.empty()) {
@@ -208,31 +204,31 @@ private:
 				"                                                             ",
 				NULL);
 			int e = errno;
-			fprintf(stderr, "*** Passenger ERROR: Could not start the spawn server: %s: %s\n",
-				rubyCommand.c_str(), strerror(e));
+			fprintf(stderr, "*** Passenger ERROR: Could not start the spawn server: %s: %s (%d)\n",
+				rubyCommand.c_str(), strerror(e), e);
 			fflush(stderr);
 			_exit(1);
 		} else if (pid == -1) {
 			int e = errno;
-			close(fds[0]);
-			close(fds[1]);
+			InterruptableCalls::close(fds[0]);
+			InterruptableCalls::close(fds[1]);
 			if (logFileHandle != NULL) {
-				fclose(logFileHandle);
+				InterruptableCalls::fclose(logFileHandle);
 			}
 			pid = 0;
 			throw SystemException("Unable to fork a process", e);
 		} else {
-			close(fds[1]);
+			InterruptableCalls::close(fds[1]);
 			if (!logFile.empty()) {
-				fclose(logFileHandle);
+				InterruptableCalls::fclose(logFileHandle);
 			}
 			channel = MessageChannel(fds[0]);
 			serverNeedsRestart = false;
 			
 			#ifdef TESTING_SPAWN_MANAGER
 				if (nextRestartShouldFail) {
-					kill(pid, SIGTERM);
-					usleep(500000);
+					InterruptableCalls::kill(pid, SIGTERM);
+					InterruptableCalls::usleep(500000);
 				}
 			#endif
 		}
@@ -244,10 +240,20 @@ private:
 	 * @param appRoot The application root of the application to spawn.
 	 * @param lowerPrivilege Whether to lower the application's privileges.
 	 * @param lowestUser The user to fallback to if lowering privilege fails.
+	 * @param environment The RAILS_ENV/RACK_ENV environment that should be used.
+	 * @param spawnMethod The spawn method to use.
+	 * @param appType The application type.
 	 * @return An Application smart pointer, representing the spawned application.
 	 * @throws SpawnException Something went wrong.
 	 */
-	ApplicationPtr sendSpawnCommand(const string &appRoot, bool lowerPrivilege, const string &lowestUser) {
+	ApplicationPtr sendSpawnCommand(
+		const string &appRoot,
+		bool lowerPrivilege,
+		const string &lowestUser,
+		const string &environment,
+		const string &spawnMethod,
+		const string &appType
+	) {
 		vector<string> args;
 		int ownerPipe;
 		
@@ -256,6 +262,9 @@ private:
 				appRoot.c_str(),
 				(lowerPrivilege) ? "true" : "false",
 				lowestUser.c_str(),
+				environment.c_str(),
+				spawnMethod.c_str(),
+				appType.c_str(),
 				NULL);
 		} catch (const SystemException &e) {
 			throw SpawnException(string("Could not write 'spawn_application' "
@@ -303,7 +312,7 @@ private:
 		}
 		
 		if (args.size() != 3) {
-			close(ownerPipe);
+			InterruptableCalls::close(ownerPipe);
 			throw SpawnException("The spawn server sent an invalid message.");
 		}
 		
@@ -311,19 +320,30 @@ private:
 		bool usingAbstractNamespace = args[2] == "true";
 		
 		if (!usingAbstractNamespace) {
-			chmod(args[1].c_str(), S_IRUSR | S_IWUSR);
-			chown(args[1].c_str(), getuid(), getgid());
+			int ret;
+			do {
+				ret = chmod(args[1].c_str(), S_IRUSR | S_IWUSR);
+			} while (ret == -1 && errno == EINTR);
+			do {
+				ret = chown(args[1].c_str(), getuid(), getgid());
+			} while (ret == -1 && errno == EINTR);
 		}
 		return ApplicationPtr(new Application(appRoot, pid, args[1],
 			usingAbstractNamespace, ownerPipe));
 	}
 	
+	/**
+	 * @throws boost::thread_interrupted
+	 */
 	ApplicationPtr
 	handleSpawnException(const SpawnException &e, const string &appRoot,
-	                     bool lowerPrivilege, const string &lowestUser) {
+	                     bool lowerPrivilege, const string &lowestUser,
+	                     const string &environment, const string &spawnMethod,
+	                     const string &appType) {
 		bool restarted;
 		try {
 			P_DEBUG("Spawn server died. Attempting to restart it...");
+			this_thread::disable_syscall_interruption dsi;
 			restartServer();
 			P_DEBUG("Restart seems to be successful.");
 			restarted = true;
@@ -335,7 +355,8 @@ private:
 			restarted = false;
 		}
 		if (restarted) {
-			return sendSpawnCommand(appRoot, lowerPrivilege, lowestUser);
+			return sendSpawnCommand(appRoot, lowerPrivilege, lowestUser,
+				environment, spawnMethod, appType);
 		} else {
 			throw SpawnException("The spawn server died unexpectedly, and restarting it failed.");
 		}
@@ -400,9 +421,6 @@ public:
 	 *            specified, no log file will be used, and the spawn server
 	 *            will use the same standard output/error channels as the
 	 *            current process.
-	 * @param environment The RAILS_ENV environment that all RoR applications
-	 *            should use. If an empty string is specified, the current value
-	 *            of the RAILS_ENV environment variable will be used.
 	 * @param rubyCommand The Ruby interpreter's command.
 	 * @param user The user that the spawn manager should run as. This
 	 *             parameter only has effect if the current process is
@@ -414,18 +432,18 @@ public:
 	 */
 	SpawnManager(const string &spawnServerCommand,
 	             const string &logFile = "",
-	             const string &environment = "production",
 	             const string &rubyCommand = "ruby",
 	             const string &user = "") {
 		this->spawnServerCommand = spawnServerCommand;
 		this->logFile = logFile;
-		this->environment = environment;
 		this->rubyCommand = rubyCommand;
 		this->user = user;
 		pid = 0;
 		#ifdef TESTING_SPAWN_MANAGER
 			nextRestartShouldFail = false;
 		#endif
+		this_thread::disable_interruption di;
+		this_thread::disable_syscall_interruption dsi;
 		try {
 			restartServer();
 		} catch (const IOException &e) {
@@ -437,13 +455,17 @@ public:
 	
 	~SpawnManager() throw() {
 		if (pid != 0) {
+			this_thread::disable_interruption di;
+			this_thread::disable_syscall_interruption dsi;
+			P_TRACE(2, "Shutting down spawn manager (PID " << pid << ").");
 			channel.close();
-			waitpid(pid, NULL, 0);
+			InterruptableCalls::waitpid(pid, NULL, 0);
+			P_TRACE(2, "Spawn manager exited.");
 		}
 	}
 	
 	/**
-	 * Spawn a new instance of a Ruby on Rails application.
+	 * Spawn a new instance of a Ruby on Rails or Rack application.
 	 *
 	 * If the spawn server died during the spawning process, then the server
 	 * will be automatically restarted, and another spawn attempt will be made.
@@ -474,20 +496,34 @@ public:
 	 *             but the path does not have to be absolute.
 	 * @param lowerPrivilege Whether to lower the application's privileges.
 	 * @param lowestUser The user to fallback to if lowering privilege fails.
+	 * @param environment The RAILS_ENV/RACK_ENV environment that should be used. May not be empty.
+	 * @param spawnMethod The spawn method to use. Either "smart" or "conservative".
+	 *                    See the Ruby class SpawnManager for details.
+	 * @param appType The application type. Either "rails" or "rack".
 	 * @return A smart pointer to an Application object, which represents the application
 	 *         instance that has been spawned. Use this object to communicate with the
 	 *         spawned application.
 	 * @throws SpawnException Something went wrong.
+	 * @throws boost::thread_interrupted
 	 */
-	ApplicationPtr spawn(const string &appRoot, bool lowerPrivilege = true, const string &lowestUser = "nobody") {
+	ApplicationPtr spawn(
+		const string &appRoot,
+		bool lowerPrivilege = true,
+		const string &lowestUser = "nobody",
+		const string &environment = "production",
+		const string &spawnMethod = "smart",
+		const string &appType = "rails"
+	) {
 		mutex::scoped_lock l(lock);
 		try {
-			return sendSpawnCommand(appRoot, lowerPrivilege, lowestUser);
+			return sendSpawnCommand(appRoot, lowerPrivilege, lowestUser,
+				environment, spawnMethod, appType);
 		} catch (const SpawnException &e) {
 			if (e.hasErrorPage()) {
 				throw;
 			} else {
-				return handleSpawnException(e, appRoot, lowerPrivilege, lowestUser);
+				return handleSpawnException(e, appRoot, lowerPrivilege,
+					lowestUser, environment, spawnMethod, appType);
 			}
 		}
 	}
@@ -508,6 +544,8 @@ public:
 	 *         restart was attempted, but it failed.
 	 */
 	void reload(const string &appRoot) {
+		this_thread::disable_interruption di;
+		this_thread::disable_syscall_interruption dsi;
 		try {
 			return sendReloadCommand(appRoot);
 		} catch (const SystemException &e) {