passenger 4.0.30 → 4.0.31

data/ext/common/ApplicationPool2/Process.h

@@ -139,7 +139,7 @@ private:
 	boost::weak_ptr<Group> group;
 	
 	/** A subset of 'sockets': all sockets that speak the
-	 * "session" protocol, sorted by socket.utilization(). */
+	 * "session" protocol, sorted by socket.busyness(). */
 	PriorityQueue<Socket> sessionSockets;
 	
 	/** The iterator inside the associated Group's process list. */
@@ -181,7 +181,7 @@ private:
 		for (it = sockets->begin(); it != sockets->end(); it++) {
 			Socket *socket = &(*it);
 			if (socket->protocol == "session" || socket->protocol == "http_session") {
-				socket->pqHandle = sessionSockets.push(socket, socket->utilization());
+				socket->pqHandle = sessionSockets.push(socket, socket->busyness());
 				if (concurrency != -1) {
 					if (socket->concurrency == 0) {
 						// If one of the sockets has a concurrency of
@@ -516,13 +516,13 @@ public:
 		}
 	}
 	
-	int utilization() const {
+	int busyness() const {
 		/* Different processes within a Group may have different
 		 * 'concurrency' values. We want:
 		 * - Group.pqueue to sort the processes from least used to most used.
 		 * - to give processes with concurrency == 0 more priority over processes
 		 *   with concurrency > 0.
-		 * Therefore, we describe our utilization as a percentage of 'concurrency', with
+		 * Therefore, we describe our busyness as a percentage of 'concurrency', with
 		 * the percentage value in [0..INT_MAX] instead of [0..1].
 		 */
 		if (concurrency == 0) {
@@ -537,26 +537,21 @@ public:
 		}
 	}
 	
-	// TODO: remove this
-	bool atFullCapacity() const {
-		return atFullUtilization();
-	}
-
 	/**
 	 * Whether we've reached the maximum number of concurrent sessions for this
 	 * process.
 	 */
-	bool atFullUtilization() const {
+	bool isTotallyBusy() const {
 		return concurrency != 0 && sessions >= concurrency;
 	}
 
 	/**
 	 * Whether a get() request can be routed to this process, assuming that
 	 * the sticky session ID (if any) matches. This is only not the case
-	 * if this process is at full utilization.
+	 * if this process is totally busy.
 	 */
 	bool canBeRoutedTo() const {
-		return !atFullUtilization();
+		return !isTotallyBusy();
 	}
 	
 	/**
@@ -570,12 +565,12 @@ public:
 	 */
 	SessionPtr newSession() {
 		Socket *socket = sessionSockets.pop();
-		if (socket->atFullCapacity()) {
+		if (socket->isTotallyBusy()) {
 			return SessionPtr();
 		} else {
 			socket->sessions++;
 			this->sessions++;
-			socket->pqHandle = sessionSockets.push(socket, socket->utilization());
+			socket->pqHandle = sessionSockets.push(socket, socket->busyness());
 			lastUsed = SystemTime::getUsec();
 			return boost::make_shared<Session>(shared_from_this(), socket);
 		}
@@ -590,8 +585,8 @@ public:
 		socket->sessions--;
 		this->sessions--;
 		processed++;
-		sessionSockets.decrease(socket->pqHandle, socket->utilization());
-		assert(!atFullUtilization());
+		sessionSockets.decrease(socket->pqHandle, socket->busyness());
+		assert(!isTotallyBusy());
 	}
 
 	/**
@@ -611,7 +606,7 @@ public:
 		stream << "<connect_password>" << connectPassword << "</connect_password>";
 		stream << "<concurrency>" << concurrency << "</concurrency>";
 		stream << "<sessions>" << sessions << "</sessions>";
-		stream << "<utilization>" << utilization() << "</utilization>";
+		stream << "<busyness>" << busyness() << "</busyness>";
 		stream << "<processed>" << processed << "</processed>";
 		stream << "<spawner_creation_time>" << spawnerCreationTime << "</spawner_creation_time>";
 		stream << "<spawn_start_time>" << spawnStartTime << "</spawn_start_time>";

data/ext/common/ApplicationPool2/Socket.h

@@ -179,17 +179,17 @@ public:
 	}
 	
 	
-	bool idle() const {
+	bool isIdle() const {
 		return sessions == 0;
 	}
 	
-	int utilization() const {
+	int busyness() const {
 		/* Different sockets within a Process may have different
 		 * 'concurrency' values. We want:
 		 * - Process.sessionSockets to sort the sockets from least used to most used.
 		 * - to give sockets with concurrency == 0 more priority over sockets
 		 *   with concurrency > 0.
-		 * Therefore, we describe our utilization as a percentage of 'concurrency', with
+		 * Therefore, we describe our busyness as a percentage of 'concurrency', with
 		 * the percentage value in [0..INT_MAX] instead of [0..1].
 		 */
 		if (concurrency == 0) {
@@ -205,7 +205,7 @@ public:
 		}
 	}
 	
-	bool atFullCapacity() const {
+	bool isTotallyBusy() const {
 		return concurrency != 0 && sessions >= concurrency;
 	}
 };

data/ext/common/ApplicationPool2/SuperGroup.h

@@ -297,7 +297,8 @@ private:
 			Group *group = route(waiter.options);
 			Options adjustedOptions = waiter.options;
 			adjustOptions(adjustedOptions, group);
-			SessionPtr session = group->get(adjustedOptions, waiter.callback);
+			SessionPtr session = group->get(adjustedOptions, waiter.callback,
+				postLockActions);
 			if (session != NULL) {
 				postLockActions.push_back(boost::bind(
 					waiter.callback, session, ExceptionPtr()));
@@ -573,7 +574,9 @@ public:
 		return false;
 	}
 	
-	SessionPtr get(const Options &newOptions, const GetCallback &callback) {
+	SessionPtr get(const Options &newOptions, const GetCallback &callback,
+		vector<Callback> &postLockActions)
+	{
 		switch (state) {
 		case INITIALIZING:
 			getWaitlist.push_back(GetWaiter(newOptions, callback));
@@ -589,10 +592,10 @@ public:
 				Options adjustedOptions = newOptions;
 				adjustOptions(adjustedOptions, group);
 				verifyInvariants();
-				return group->get(adjustedOptions, callback);
+				return group->get(adjustedOptions, callback, postLockActions);
 			} else {
 				verifyInvariants();
-				return defaultGroup->get(newOptions, callback);
+				return defaultGroup->get(newOptions, callback, postLockActions);
 			}
 		case DESTROYING:
 		case DESTROYED:
@@ -618,19 +621,29 @@ public:
 		return defaultGroup;
 	}
 	
-	unsigned int utilization() const {
+	unsigned int capacityUsed() const {
 		vector<GroupPtr>::const_iterator it, end = groups.end();
 		unsigned int result = 0;
 		
 		for (it = groups.begin(); it != end; it++) {
-			result += (*it)->utilization();
+			result += (*it)->capacityUsed();
 		}
 		if (state == INITIALIZING || state == RESTARTING) {
 			result++;
 		}
 		return result;
 	}
-	
+
+	unsigned int getProcessCount() const {
+		unsigned int result = 0;
+		vector<GroupPtr>::const_iterator g_it, g_end = groups.end();
+		for (g_it = groups.begin(); g_it != g_end; g_it++) {
+			const GroupPtr &group = *g_it;
+			result += group->getProcessCount();
+		}
+		return result;
+	}
+
 	bool needsRestart() const {
 		return false;
 	}
@@ -652,16 +665,6 @@ public:
 		verifyInvariants();
 	}
 
-	unsigned int getProcessCount() const {
-		unsigned int result = 0;
-		vector<GroupPtr>::const_iterator g_it, g_end = groups.end();
-		for (g_it = groups.begin(); g_it != g_end; g_it++) {
-			const GroupPtr &group = *g_it;
-			result += group->getProcessCount();
-		}
-		return result;
-	}
-
 	string inspect() const {
 		return name;
 	}

data/ext/common/Constants.h

@@ -38,6 +38,12 @@
 
 	#define APACHE2_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Apache.html"
 
+	#define DEB_APACHE_MODULE_PACKAGE "libapache2-mod-passenger"
+
+	#define DEB_DEV_PACKAGE "passenger-dev"
+
+	#define DEB_NGINX_PACKAGE "nginx-extras"
+
 	#define DEFAULT_ANALYTICS_LOG_GROUP ""
 
 	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
@@ -68,6 +74,8 @@
 
 	#define DEFAULT_WEB_APP_USER "nobody"
 
+	#define ENTERPRISE_URL "http://www.phusionpassenger.com/enterprise"
+
 	#define FEEDBACK_FD 3
 
 	#define INDEX_DOC_URL "http://www.modrails.com/documentation/Users%20guide.html"
@@ -78,7 +86,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.30"
+	#define PASSENGER_VERSION "4.0.31"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -88,6 +96,12 @@
 
 	#define PROGRAM_NAME "Phusion Passenger"
 
+	#define RPM_APACHE_MODULE_PACKAGE "mod_passenger"
+
+	#define RPM_DEV_PACKAGE "passenger-devel"
+
+	#define RPM_NGINX_PACKAGE "nginx"
+
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 3
 
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0

data/ext/common/MessageServer.h

@@ -49,6 +49,7 @@
 #include <Utils/StrIntUtils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/MessageIO.h>
+#include <Utils/VariantMap.h>
 
 namespace Passenger {
 
@@ -247,6 +248,27 @@ public:
 			return args.size() >= minargs + 1 && args.size() <= maxargs + 1 && args[0] == command;
 		}
 
+		/** Utility function for converting arguments (starting from the given index)
+		 * into a VariantMap.
+		 *
+		 * @throws ArgumentException The number of arguments isn't an even number.
+		 */
+		VariantMap argsToOptions(const vector<string> &args, unsigned int startIndex = 1) const {
+			VariantMap map;
+			vector<string>::const_iterator it = args.begin() + startIndex, end = args.end();
+			while (it != end) {
+				const string &key = *it;
+				it++;
+				if (it == end) {
+					throw ArgumentException("Invalid options");
+				}
+				const string &value = *it;
+				map.set(key, value);
+				it++;
+			}
+			return map;
+		}
+
 	public:
 		virtual ~Handler() { }
 		

data/ext/common/Utils.cpp

@@ -540,7 +540,10 @@ absolutizePath(const StaticString &path, const StaticString &workingDir) {
 	if (!startsWith(path, "/")) {
 		if (workingDir.empty()) {
 			char buffer[PATH_MAX];
-			getcwd(buffer, sizeof(buffer));
+			if (getcwd(buffer, sizeof(buffer)) == NULL) {
+				int e = errno;
+				throw SystemException("Unable to query current working directory", e);
+			}
 			split(buffer + 1, '/', components);
 		} else {
 			string absoluteWorkingDir = absolutizePath(workingDir);

data/ext/common/Utils.h

@@ -249,8 +249,10 @@ mode_t parseModeString(const StaticString &mode);
 /**
  * Turns the given path into an absolute path. Unlike realpath(), this function does
  * not resolve symlinks.
+ *
+ * @throws SystemException
  */
-string absolutizePath(const StaticString &path, const StaticString &workingDir = "");
+string absolutizePath(const StaticString &path, const StaticString &workingDir = StaticString());
 
 /**
  * Return the path name for the directory in which the system stores general

data/ext/common/Utils/StrIntUtils.h

@@ -30,6 +30,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <new>
+#include <cstdlib>
 #include <cstddef>
 #include <ctime>
 #include <oxt/macros.hpp>

data/ext/common/Utils/Timer.h

@@ -91,7 +91,21 @@ public:
 		startTime.tv_sec = 0;
 		startTime.tv_usec = 0;
 	}
-	
+
+	/**
+	 * Resets the timer. If the timer was already started then it is still started;
+	 * if it was stopped then it is still stopped.
+	 */
+	void reset() {
+		boost::lock_guard<boost::mutex> l(lock);
+		if (startTime.tv_sec != 0 || startTime.tv_usec != 0) {
+			int ret;
+			do {
+				ret = gettimeofday(&startTime, NULL);
+			} while (ret == -1 && errno == EINTR);
+		}
+	}
+
 	/**
 	 * Returns the amount of time that has elapsed since the timer was last started,
 	 * in miliseconds. If the timer is currently stopped, then 0 is returned.

data/ext/common/agents/Base.cpp

@@ -85,6 +85,13 @@ struct AbortHandlerState {
 typedef void (*Callback)(AbortHandlerState &state, void *userData);
 
 
+#define IGNORE_SYSCALL_RESULT(code) \
+	do { \
+		int _ret = code; \
+		(void) _ret; \
+	} while (false)
+
+
 static bool _feedbackFdAvailable = false;
 static const char digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
@@ -150,6 +157,15 @@ hasEnvOption(const char *name, bool defaultValue = false) {
 	}
 }
 
+// When we're in a crash handler, there's nothing we can do if we fail to
+// write to stderr, so we ignore its return value and we ignore compiler
+// warnings about ignoring that.
+static void
+write_nowarn(int fd, const void *buf, size_t n) {
+	ssize_t ret = write(fd, buf, n);
+	(void) ret;
+}
+
 // No idea whether strlen() is async signal safe, but let's not risk it
 // and write our own version instead that's guaranteed to be safe.
 static size_t
@@ -165,7 +181,7 @@ safeStrlen(const char *str) {
 // Async-signal safe way to print to stderr.
 static void
 safePrintErr(const char *message) {
-	write(STDERR_FILENO, message, strlen(message));
+	write_nowarn(STDERR_FILENO, message, strlen(message));
 }
 
 // Must be async signal safe.
@@ -369,7 +385,7 @@ runInSubprocessWithTimeLimit(AbortHandlerState &state, Callback callback, void *
 		end = appendText(end, "Could not create subprocess: pipe() failed with errno=");
 		end = appendULL(end, e);
 		end = appendText(end, "\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 		return -1;
 	}
 
@@ -388,7 +404,7 @@ runInSubprocessWithTimeLimit(AbortHandlerState &state, Callback callback, void *
 		end = appendText(end, "Could not create subprocess: fork() failed with errno=");
 		end = appendULL(end, e);
 		end = appendText(end, "\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 		return -1;
 
 	} else {
@@ -430,7 +446,7 @@ dumpFileDescriptorInfoWithLsof(AbortHandlerState &state, void *userData) {
 	end = appendText(end, "ERROR: cannot execute command 'lsof': errno=");
 	end = appendULL(end, errno);
 	end = appendText(end, "\n");
-	write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+	write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 	_exit(1);
 }
 
@@ -462,7 +478,7 @@ dumpFileDescriptorInfo(AbortHandlerState &state) {
 	end = messageBuf;
 	end = appendText(end, state.messagePrefix);
 	end = appendText(end, " ] Open files and file descriptors:\n");
-	write(STDERR_FILENO, messageBuf, end - messageBuf);
+	write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	status = runInSubprocessWithTimeLimit(state, dumpFileDescriptorInfoWithLsof, NULL, 4000);
 
@@ -485,7 +501,7 @@ dumpFileDescriptorInfo(AbortHandlerState &state) {
 			} else {
 				end = messageBuf;
 				end = appendText(end, "ERROR: No other file descriptor dumping mechanism on current platform detected.\n");
-				write(STDERR_FILENO, messageBuf, end - messageBuf);
+				write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 			}
 		}
 	}
@@ -513,7 +529,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 			end = appendText(end, "(execlp() returned errno=");
 			end = appendULL(end, e);
 			end = appendText(end, ") Please check your file permissions or something.\n");
-			write(STDERR_FILENO, messageBuf, end - messageBuf);
+			write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 		}
 		_exit(1);
 
@@ -523,7 +539,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 		end = appendText(end, "Could not execute crash-watch: fork() failed with errno=");
 		end = appendULL(end, e);
 		end = appendText(end, "\n");
-		write(STDERR_FILENO, messageBuf, end - messageBuf);
+		write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	} else {
 		waitpid(child, NULL, 0);
@@ -542,7 +558,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 		end = appendText(end, " ] Backtrace with ");
 		end = appendULL(end, (unsigned long long) frames);
 		end = appendText(end, " frames:\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 
 		if (backtraceSanitizerCommand != NULL) {
 			int p[2];
@@ -553,7 +569,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 				end = appendULL(end, e);
 				end = appendText(end, "\n");
 				end = appendText(end, "Falling back to writing to stderr directly...\n");
-				write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+				write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 				backtrace_symbols_fd(backtraceStore, frames, STDERR_FILENO);
 				return;
 			}
@@ -586,7 +602,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 				end = appendText(end, "ERROR: cannot execute '");
 				end = appendText(end, backtraceSanitizerCommand);
 				end = appendText(end, "' for sanitizing the backtrace, trying 'cat'...\n");
-				write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+				write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 				execlp("cat", "cat", (const char * const) 0);
 				execlp("/bin/cat", "cat", (const char * const) 0);
 				execlp("/usr/bin/cat", "cat", (const char * const) 0);
@@ -602,7 +618,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 				end = appendULL(end, e);
 				end = appendText(end, "\n");
 				end = appendText(end, "Falling back to writing to stderr directly...\n");
-				write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+				write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 				backtrace_symbols_fd(backtraceStore, frames, STDERR_FILENO);
 
 			} else {
@@ -616,7 +632,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 					end = appendText(end, "ERROR: cannot execute '");
 					end = appendText(end, backtraceSanitizerCommand);
 					end = appendText(end, "' for sanitizing the backtrace, writing to stderr directly...\n");
-					write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+					write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 					backtrace_symbols_fd(backtraceStore, frames, STDERR_FILENO);
 				}
 			}
@@ -643,7 +659,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 	end = messageBuf;
 	end = appendText(end, state.messagePrefix);
 	end = appendText(end, " ] Date, uname and ulimits:\n");
-	write(STDERR_FILENO, messageBuf, end - messageBuf);
+	write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	// Dump human-readable time string and string.
 	pid = asyncFork();
@@ -686,7 +702,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 	end = messageBuf;
 	end = appendText(end, state.messagePrefix);
 	end = appendText(end, " ] Phusion Passenger version: " PASSENGER_VERSION "\n");
-	write(STDERR_FILENO, messageBuf, end - messageBuf);
+	write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	if (lastAssertionFailure.filename != NULL) {
 		end = messageBuf;
@@ -704,7 +720,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 		end = appendText(end, ", line ");
 		end = appendULL(end, lastAssertionFailure.line);
 		end = appendText(end, ".\n");
-		write(STDERR_FILENO, messageBuf, end - messageBuf);
+		write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 	}
 
 	// It is important that writing the message and the backtrace are two
@@ -717,7 +733,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 	#else
 		end = appendText(end, " ] libc backtrace not available.\n");
 	#endif
-	write(STDERR_FILENO, messageBuf, end - messageBuf);
+	write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 
 	#ifdef LIBC_HAS_BACKTRACE_FUNC
 		runInSubprocessWithTimeLimit(state, dumpBacktrace, NULL, 4000);
@@ -729,7 +745,7 @@ dumpDiagnostics(AbortHandlerState &state) {
 		end = messageBuf;
 		end = appendText(end, state.messagePrefix);
 		end = appendText(end, " ] Dumping additional diagnostical information...\n");
-		write(STDERR_FILENO, messageBuf, end - messageBuf);
+		write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 		safePrintErr("--------------------------------------\n");
 		runInSubprocessWithTimeLimit(state, runCustomDiagnosticsDumper, NULL, 2000);
 		safePrintErr("--------------------------------------\n");
@@ -746,10 +762,10 @@ dumpDiagnostics(AbortHandlerState &state) {
 		#else
 			end = appendText(end, " ] Dumping a backtrace with crash-watch...\n");
 		#endif
-		write(STDERR_FILENO, messageBuf, end - messageBuf);
+		write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 		dumpWithCrashWatch(state);
 	} else {
-		write(STDERR_FILENO, "\n", 1);
+		write_nowarn(STDERR_FILENO, "\n", 1);
 	}
 }
 
@@ -836,7 +852,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 			end = appendText(end, ", reason=");
 			end = appendSignalReason(end, state.info);
 			end = appendText(end, "\n");
-			write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+			write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 			// Run default signal handler.
 			raise(signo);
 		} else {
@@ -847,16 +863,24 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 			end = appendText(end, ", reason=");
 			end = appendSignalReason(end, state.info);
 			end = appendText(end, "\n");
-			write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+			write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 			_exit(1);
 		}
 		return;
 	}
 
-	close(emergencyPipe1[0]);
-	close(emergencyPipe1[1]);
-	close(emergencyPipe2[0]);
-	close(emergencyPipe2[1]);
+	if (emergencyPipe1[0] != -1) {
+		close(emergencyPipe1[0]);
+	}
+	if (emergencyPipe1[1] != -1) {
+		close(emergencyPipe1[1]);
+	}
+	if (emergencyPipe2[0] != -1) {
+		close(emergencyPipe2[0]);
+	}
+	if (emergencyPipe2[1] != -1) {
+		close(emergencyPipe2[1]);
+	}
 	emergencyPipe1[0] = emergencyPipe1[1] = -1;
 	emergencyPipe2[0] = emergencyPipe2[1] = -1;
 
@@ -883,7 +907,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 	end = appendText(end, ", randomSeed=");
 	end = appendULL(end, (unsigned long long) randomSeed);
 	end = appendText(end, "\n");
-	write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+	write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 
 	end = state.messageBuf;
 	if (*crashLogFile != '\0') {
@@ -895,13 +919,13 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 		end = appendText(end, state.messagePrefix);
 		end = appendText(end, " ] Could not create crash log file, so dumping to stderr only.\n");
 	}
-	write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+	write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 
 	if (beepOnAbort) {
 		end = state.messageBuf;
 		end = appendText(end, state.messagePrefix);
 		end = appendText(end, " ] PASSENGER_BEEP_ON_ABORT on, executing beep...\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 
 		child = asyncFork();
 		if (child == 0) {
@@ -922,7 +946,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 			end = appendText(end, " ] Could fork a child process for invoking a beep: fork() failed with errno=");
 			end = appendULL(end, e);
 			end = appendText(end, "\n");
-			write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+			write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 		}
 	}
 
@@ -930,7 +954,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 		end = state.messageBuf;
 		end = appendText(end, state.messagePrefix);
 		end = appendText(end, " ] PASSENGER_STOP_ON_ABORT on, so process stopped. Send SIGCONT when you want to continue.\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 		raise(SIGSTOP);
 	}
 
@@ -970,7 +994,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 			end = appendText(end, "] Could fork a child process for dumping diagnostics: fork() failed with errno=");
 			end = appendULL(end, e);
 			end = appendText(end, "\n");
-			write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+			write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 			_exit(1);
 
 		} else {
@@ -985,7 +1009,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 		end = appendText(end, " ] Could fork a child process for dumping diagnostics: fork() failed with errno=");
 		end = appendULL(end, e);
 		end = appendText(end, "\n");
-		write(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
+		write_nowarn(STDERR_FILENO, state.messageBuf, end - state.messageBuf);
 
 	} else {
 		raise(SIGSTOP);
@@ -1477,8 +1501,8 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 		shouldDumpWithCrashWatch = hasEnvOption("PASSENGER_DUMP_WITH_CRASH_WATCH", true);
 		beepOnAbort  = hasEnvOption("PASSENGER_BEEP_ON_ABORT", false);
 		stopOnAbort = hasEnvOption("PASSENGER_STOP_ON_ABORT", false);
-		pipe(emergencyPipe1);
-		pipe(emergencyPipe2);
+		IGNORE_SYSCALL_RESULT(pipe(emergencyPipe1));
+		IGNORE_SYSCALL_RESULT(pipe(emergencyPipe2));
 		installAbortHandler();
 	}
 	oxt::initialize();