passenger 5.1.7 → 5.1.8

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -43,6 +43,9 @@ module PhusionPassenger
   module SharedConstants
     # Default config values
     DEFAULT_LOG_LEVEL = 3
+    DEFAULT_LOG_LEVEL_NAME = "notice"
+    DEFAULT_APP_OUTPUT_LOG_LEVEL = 3
+    DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME = "notice"
     DEFAULT_INTEGRATION_MODE = "standalone"
     DEFAULT_SOCKET_BACKLOG = 2048
     DEFAULT_RUBY = "ruby"
@@ -77,13 +80,13 @@ module PhusionPassenger
     MESSAGE_SERVER_MAX_PASSWORD_SIZE = 100
     POOL_HELPER_THREAD_STACK_SIZE = 1024 * 256
     # Small mbuf sizes avoid memory overhead (up to 1 blocksize per request), but
-    # also introduce context switching and smaller transfer writes. The size is picked 
+    # also introduce context switching and smaller transfer writes. The size is picked
     # to balance this out.
     DEFAULT_MBUF_CHUNK_SIZE = 1024 * 4
     # Affects input and output buffering (between app and client). Threshold is picked
     # such that it fits most output (i.e. html page size, not assets), and allows for
-    # high concurrency with low mem overhead. On the upload side there is a penalty 
-    # but there's no real average upload size anyway so we choose mem safety instead. 
+    # high concurrency with low mem overhead. On the upload side there is a penalty
+    # but there's no real average upload size anyway so we choose mem safety instead.
     DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD = 1024 * 128
     SERVER_KIT_MAX_SERVER_ENDPOINTS = 4
 

data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb

@@ -535,6 +535,7 @@ module PhusionPassenger
             @engine.stop
             STDOUT.puts " done"
             STDOUT.flush
+            File.delete(@options[:socket_file]) if @options[:engine] == "nginx" && @options[:socket_file]
           end
           @engine = nil
         end

data/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb

@@ -48,6 +48,7 @@ module PhusionPassenger
         end
         if running
           @controller.stop
+          File.delete(@options[:socket_file]) if @options[:engine] == "nginx" && @options[:socket_file]
         else
           Standalone::ControlUtils.warn_pid_file_not_found(@options)
           exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.1.8
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -340,6 +340,7 @@ files:
 - src/agent/Core/Controller/BufferBody.cpp
 - src/agent/Core/Controller/CheckoutSession.cpp
 - src/agent/Core/Controller/Client.h
+- src/agent/Core/Controller/Config.cpp
 - src/agent/Core/Controller/Config.h
 - src/agent/Core/Controller/ForwardResponse.cpp
 - src/agent/Core/Controller/Hooks.cpp
@@ -422,15 +423,19 @@ files:
 - src/cxx_supportlib/AppTypes.h
 - src/cxx_supportlib/BackgroundEventLoop.cpp
 - src/cxx_supportlib/BackgroundEventLoop.h
+- src/cxx_supportlib/ConfigKit/AsyncUtils.h
 - src/cxx_supportlib/ConfigKit/Common.h
 - src/cxx_supportlib/ConfigKit/ConfigKit.h
 - src/cxx_supportlib/ConfigKit/DummyTranslator.h
+- src/cxx_supportlib/ConfigKit/IN_PRACTICE.md
 - src/cxx_supportlib/ConfigKit/PrefixTranslator.h
 - src/cxx_supportlib/ConfigKit/README.md
 - src/cxx_supportlib/ConfigKit/Schema.h
 - src/cxx_supportlib/ConfigKit/Store.h
+- src/cxx_supportlib/ConfigKit/SubComponentUtils.h
 - src/cxx_supportlib/ConfigKit/TableTranslator.h
 - src/cxx_supportlib/ConfigKit/Utils.h
+- src/cxx_supportlib/ConfigKit/ValidationUtils.h
 - src/cxx_supportlib/ConfigKit/VariantMapUtils.h
 - src/cxx_supportlib/Constants.h
 - src/cxx_supportlib/Constants.h.cxxcodebuilder
@@ -446,8 +451,13 @@ files:
 - src/cxx_supportlib/Hooks.h
 - src/cxx_supportlib/InstanceDirectory.h
 - src/cxx_supportlib/Integrations/LibevJsonUtils.h
-- src/cxx_supportlib/Logging.cpp
-- src/cxx_supportlib/Logging.h
+- src/cxx_supportlib/LoggingKit/Assert.h
+- src/cxx_supportlib/LoggingKit/Config.h
+- src/cxx_supportlib/LoggingKit/Context.h
+- src/cxx_supportlib/LoggingKit/Forward.h
+- src/cxx_supportlib/LoggingKit/Implementation.cpp
+- src/cxx_supportlib/LoggingKit/Logging.h
+- src/cxx_supportlib/LoggingKit/LoggingKit.h
 - src/cxx_supportlib/LveLoggingDecorator.h
 - src/cxx_supportlib/MemoryKit/mbuf.cpp
 - src/cxx_supportlib/MemoryKit/mbuf.h

data/src/cxx_supportlib/Logging.cpp

@@ -1,295 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
- *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
- *
- *  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.
- */
-#include <iomanip>
-#include <cstdlib>
-#include <cstring>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <boost/thread.hpp>
-#include <boost/atomic.hpp>
-#include <Logging.h>
-#include <Constants.h>
-#include <StaticString.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
-
-namespace Passenger {
-
-volatile sig_atomic_t _logLevel = DEFAULT_LOG_LEVEL;
-AssertionFailureInfo lastAssertionFailure;
-static bool printAppOutputAsDebuggingMessages = false;
-
-static boost::mutex logFileMutex;
-static string logFile;
-static int logFd = STDERR_FILENO;
-
-static int fileDescriptorLog = -1;
-static string fileDescriptorLogFile;
-
-#define TRUNCATE_LOGPATHS_TO_MAXCHARS 3 // set to 0 to disable truncation
-
-
-void
-setLogLevel(int value) {
-	_logLevel = value;
-	boost::atomic_signal_fence(boost::memory_order_seq_cst);
-}
-
-string getLogFile() {
-	boost::lock_guard<boost::mutex> l(logFileMutex);
-	return logFile;
-}
-
-bool
-setLogFile(const string &path, int *errcode) {
-	int fd = open(path.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0644);
-	if (fd != -1) {
-		setLogFileWithFd(path, fd);
-		close(fd);
-		return true;
-	} else {
-		if (errcode != NULL) {
-			*errcode = errno;
-		}
-		return false;
-	}
-}
-
-void
-setLogFileWithFd(const string &path, int fd) {
-	boost::lock_guard<boost::mutex> l(logFileMutex);
-	dup2(fd, STDOUT_FILENO);
-	dup2(fd, STDERR_FILENO);
-	logFile = path;
-}
-
-bool
-setLogFileWithoutRedirectingStderr(const string &path, int *errcode) {
-	int fd = open(path.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0644);
-	if (fd != -1) {
-		int oldLogFd = logFd;
-		logFd = fd;
-		if (oldLogFd != STDERR_FILENO) {
-			close(oldLogFd);
-		}
-		boost::lock_guard<boost::mutex> l(logFileMutex);
-		logFile = path;
-		return true;
-	} else {
-		if (errcode != NULL) {
-			*errcode = errno;
-		}
-		return false;
-	}
-}
-
-bool
-hasFileDescriptorLogFile() {
-	return fileDescriptorLog != -1;
-}
-
-string
-getFileDescriptorLogFile() {
-	return fileDescriptorLogFile;
-}
-
-int
-getFileDescriptorLogFileFd() {
-	return fileDescriptorLog;
-}
-
-bool
-setFileDescriptorLogFile(const string &path, int *errcode) {
-	int fd = open(path.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0644);
-	if (fd != -1) {
-		if (fileDescriptorLog == -1) {
-			fileDescriptorLog = fd;
-		} else {
-			dup2(fd, fileDescriptorLog);
-			close(fd);
-		}
-		if (fileDescriptorLogFile != path) {
-			// Do not mutate `fileDescriptorLogFile` if the path
-			// hasn't changed. This allows `setFileDescriptorLogFile()`
-			// to be thread-safe within the documented constraints.
-			fileDescriptorLogFile = path;
-		}
-		return true;
-	} else {
-		if (errcode != NULL) {
-			*errcode = errno;
-		}
-		return false;
-	}
-}
-
-void
-_prepareLogEntry(FastStringStream<> &sstream, const char *file, unsigned int line) {
-	struct tm the_tm;
-	char datetime_buf[32];
-	int datetime_size;
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-	localtime_r(&tv.tv_sec, &the_tm);
-	datetime_size = snprintf(datetime_buf, sizeof(datetime_buf),
-		"%d-%02d-%02d %02d:%02d:%02d.%04llu",
-		the_tm.tm_year + 1900, the_tm.tm_mon + 1, the_tm.tm_mday,
-		the_tm.tm_hour, the_tm.tm_min, the_tm.tm_sec,
-		(unsigned long long) tv.tv_usec / 100);
-	sstream <<
-		"[ " << StaticString(datetime_buf, datetime_size) <<
-		" " << std::dec << getpid() << "/" <<
-			std::hex << pthread_self() << std::dec <<
-		" ";
-
-	if (startsWith(file, P_STATIC_STRING("src/"))) { // special reduncancy filter because most code resides in these paths
-		file += sizeof("src/") - 1;
-		if (startsWith(file, P_STATIC_STRING("cxx_supportlib/"))) {
-			file += sizeof("cxx_supportlib/") - 1;
-		}
-	}
-
-	if (TRUNCATE_LOGPATHS_TO_MAXCHARS > 0) {
-		truncateBeforeTokens(file, P_STATIC_STRING("/\\"), TRUNCATE_LOGPATHS_TO_MAXCHARS, sstream);
-	} else {
-		sstream << file;
-	}
-
-	sstream << ":" << line << " ]: ";
-}
-
-static void
-writeExactWithoutOXT(int fd, const char *str, unsigned int size) {
-	/* We do not use writeExact() here because writeExact()
-	 * uses oxt::syscalls::write(), which is an interruption point and
-	 * which is slightly more expensive than a plain write().
-	 * Logging may block, but in most cases not indefinitely,
-	 * so we don't care if the write() here is not an interruption
-	 * point. If the write does block indefinitely then it's
-	 * probably a FIFO that is not opened on the other side.
-	 * In that case we can blame the user.
-	 */
-	ssize_t ret;
-	unsigned int written = 0;
-	while (written < size) {
-		do {
-			ret = write(fd, str + written, size - written);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			/* The most likely reason why this fails is when the user has setup
-			 * Apache to log to a pipe (e.g. to a log rotation script). Upon
-			 * restarting the web server, the process that reads from the pipe
-			 * shuts down, so we can't write to it anymore. That's why we
-			 * just ignore write errors. It doesn't make sense to abort for
-			 * something like this.
-			 */
-			break;
-		} else {
-			written += ret;
-		}
-	}
-}
-
-void
-_writeLogEntry(const char *str, unsigned int size) {
-	writeExactWithoutOXT(logFd, str, size);
-}
-
-void
-_writeFileDescriptorLogEntry(const char *str, unsigned int size) {
-	writeExactWithoutOXT(fileDescriptorLog, str, size);
-}
-
-const char *
-_strdupFastStringStream(const FastStringStream<> &stream) {
-	char *buf = (char *) malloc(stream.size() + 1);
-	memcpy(buf, stream.data(), stream.size());
-	buf[stream.size()] = '\0';
-	return buf;
-}
-
-static void
-realPrintAppOutput(char *buf, unsigned int bufSize,
-	const char *pidStr, unsigned int pidStrLen,
-	const char *channelName, unsigned int channelNameLen,
-	const char *message, unsigned int messageLen)
-{
-	char *pos = buf;
-	char *end = buf + bufSize;
-
-	pos = appendData(pos, end, "App ");
-	pos = appendData(pos, end, pidStr, pidStrLen);
-	pos = appendData(pos, end, " ");
-	pos = appendData(pos, end, channelName, channelNameLen);
-	pos = appendData(pos, end, ": ");
-	pos = appendData(pos, end, message, messageLen);
-	pos = appendData(pos, end, "\n");
-	_writeLogEntry(buf, pos - buf);
-}
-
-void
-printAppOutput(pid_t pid, const char *channelName, const char *message, unsigned int size) {
-	if (printAppOutputAsDebuggingMessages) {
-		P_DEBUG("App " << pid << " " << channelName << ": " << StaticString(message, size));
-	} else {
-		char pidStr[sizeof("4294967295")];
-		unsigned int pidStrLen, channelNameLen, totalLen;
-
-		try {
-			pidStrLen = integerToOtherBase<pid_t, 10>(pid, pidStr, sizeof(pidStr));
-		} catch (const std::length_error &) {
-			pidStr[0] = '?';
-			pidStr[1] = '\0';
-			pidStrLen = 1;
-		}
-
-		channelNameLen = strlen(channelName);
-		totalLen = (sizeof("App X Y: \n") - 2) + pidStrLen + channelNameLen + size;
-		if (totalLen < 1024) {
-			char buf[1024];
-			realPrintAppOutput(buf, sizeof(buf),
-				pidStr, pidStrLen,
-				channelName, channelNameLen,
-				message, size);
-		} else {
-			DynamicBuffer buf(totalLen);
-			realPrintAppOutput(buf.data, totalLen,
-				pidStr, pidStrLen,
-				channelName, channelNameLen,
-				message, size);
-		}
-	}
-}
-
-void
-setPrintAppOutputAsDebuggingMessages(bool enabled) {
-	printAppOutputAsDebuggingMessages = enabled;
-}
-
-} // namespace Passenger
-

data/src/cxx_supportlib/Logging.h

@@ -1,385 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
- *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
- *
- *  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_LOGGING_H_
-#define _PASSENGER_LOGGING_H_
-
-#include <oxt/thread.hpp>
-#include <oxt/system_calls.hpp>
-#include <oxt/macros.hpp>
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <sys/resource.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <string>
-#include <exception>
-#include <stdexcept>
-#include <ios>
-#include <ostream>
-#include <sstream>
-#include <cstdio>
-#include <ctime>
-#include <cerrno>
-#include <csignal>
-#include <Utils/FastStringStream.h>
-
-
-namespace Passenger {
-
-using namespace std;
-using namespace boost;
-using namespace oxt;
-
-
-struct AssertionFailureInfo {
-	const char *filename;
-	const char *function; // May be NULL.
-	const char *expression;
-	unsigned int line;
-};
-
-extern volatile sig_atomic_t _logLevel;
-// If assert() or similar fails, we attempt to store its information here.
-extern AssertionFailureInfo lastAssertionFailure;
-
-/**
- * Returns the current log level. This method is thread-safe.
- */
-inline OXT_FORCE_INLINE int
-getLogLevel() {
-	return (int) _logLevel;
-}
-
-/**
- * Sets the log level. This method is thread-safe.
- */
-void setLogLevel(int value);
-
-/**
- * Returns the general log file that we're using, or the empty string
- * if we're not using a log file.
- *
- * This method is thread-safe.
- */
-string getLogFile();
-
-/**
- * Sets the general log file. This method is thread-safe.
- * Returns whether the new log file can be opened. If not,
- * `errcode` (if non-NULL) is set to the relevant filesystem
- * error code.
- */
-bool setLogFile(const string &path, int *errcode = NULL);
-
-/**
- * Sets the general log file, assuming that it's already opened
- * at the given fd. This method is thread-safe.
- */
-void setLogFileWithFd(const string &path, int fd);
-
-/**
- * Sets the general log file. Unlike `setLogFile()` and `setLogFileWithFd()`,
- * this method does not redirect stderr to that file. This is useful in
- * e.g. the Apache module where redirecting stderr is not safe because it
- * would affect all the other Apache modules too.
- *
- * Returns whether the new log file can be opened. If not,
- * `errcode` (if non-NULL) is set to the relevant filesystem
- * error code.
- *
- * WARNING:
- * This method is NOT thread-safe.
- * Once you have called this method, you may not call `setLogFile()`
- * or `setLogFileWithFd()`.
- */
-bool setLogFileWithoutRedirectingStderr(const string &path, int *errcode = NULL);
-
-/**
- * Returns whether we're using a separate log file for logging file
- * descriptor opening and closing.
- *
- * See `getFileDescriptorLogFile()` for thread-safety notes.
- */
-bool hasFileDescriptorLogFile();
-
-/**
- * Returns the file that we're using for logging file descriptor
- * opening and closing, or the empty string if we're not using a
- * separate log file.
- *
- * This method is only thread-safe if `setFileDescriptorLogFile()`
- * was called before any threads were made, and at the same time
- * `setFileDescriptorLogFile()` is never called again with a different
- * argument. In other words, only reopening the same log file is
- * thread-safe.
- */
-string getFileDescriptorLogFile();
-
-/**
- * Returns the file descriptor of the log file that we're using for
- * logging file descriptor opening and closing, or -1 if we're not using a
- * separate log file.
- *
- * See `getFileDescriptorLogFile()` for thread-safety notes.
- */
-int getFileDescriptorLogFileFd();
-
-/**
- * Sets the log file to use specifically for logging file descriptor
- * opening and closing.
- *
- * This method is only thread-safe if you `path` equals what
- * `getFileDescriptorLogFile()` returns. In other words, when
- * you're reopening the log file.
- *
- * Returns whether the new log file can be opened. If not,
- * errcode (if non-NULL) is set to the relevant filesystem
- * error code.
- */
-bool setFileDescriptorLogFile(const string &path, int *errcode = NULL);
-
-void _prepareLogEntry(FastStringStream<> &sstream, const char *file, unsigned int line);
-void _writeLogEntry(const char *str, unsigned int size);
-void _writeFileDescriptorLogEntry(const char *str, unsigned int size);
-const char *_strdupFastStringStream(const FastStringStream<> &stream);
-
-
-enum PassengerLogLevel {
-	LVL_CRIT   = 0,
-	LVL_ERROR  = 1,
-	LVL_WARN   = 2,
-	LVL_NOTICE = 3,
-	LVL_INFO   = 4,
-	LVL_DEBUG  = 5,
-	LVL_DEBUG2 = 6,
-	LVL_DEBUG3 = 7
-};
-
-/**
- * Write the given expression to the log stream.
- */
-#define P_LOG(level, file, line, expr) \
-	do { \
-		if (Passenger::getLogLevel() >= (level)) { \
-			Passenger::FastStringStream<> _ostream; \
-			Passenger::_prepareLogEntry(_ostream, file, line); \
-			_ostream << expr << "\n"; \
-			Passenger::_writeLogEntry(_ostream.data(), _ostream.size()); \
-		} \
-	} while (false)
-
-#define P_LOG_UNLIKELY(level, file, line, expr) \
-	do { \
-		if (OXT_UNLIKELY(Passenger::getLogLevel() >= (level))) { \
-			Passenger::FastStringStream<> _ostream; \
-			Passenger::_prepareLogEntry(_ostream, file, line); \
-			_ostream << expr << "\n"; \
-			Passenger::_writeLogEntry(_ostream.data(), _ostream.size()); \
-		} \
-	} while (false)
-
-/**
- * Write the given expression, which represents a warning,
- * to the log stream.
- */
-#define P_WARN(expr) P_LOG(LVL_WARN, __FILE__, __LINE__, expr)
-#define P_WARN_WITH_POS(file, line, expr) P_LOG(LVL_WARN, file, line, expr)
-
-/**
- * Write the given expression, which represents a notice (important information),
- * to the log stream.
- */
-#define P_NOTICE(expr) P_LOG(LVL_NOTICE, __FILE__, __LINE__, expr)
-#define P_NOTICE_WITH_POS(file, line, expr) P_LOG(LVL_NOTICE, file, line, expr)
-
-/**
- * Write the given expression, which represents a normal information message,
- * to the log stream.
- */
-#define P_INFO(expr) P_LOG(LVL_INFO, __FILE__, __LINE__, expr)
-#define P_INFO_WITH_POS(file, line, expr) P_LOG(LVL_INFO, file, line, expr)
-
-/**
- * Write the given expression, which represents an error,
- * to the log stream.
- */
-#define P_ERROR(expr) P_LOG(LVL_ERROR, __FILE__, __LINE__, expr)
-#define P_ERROR_WITH_POS(file, line, expr) P_LOG(LVL_ERROR, file, line, expr)
-
-/**
- * Write the given expression, which represents a critical non-recoverable error,
- * to the log stream.
- */
-#define P_CRITICAL(expr) P_LOG(LVL_CRIT, __FILE__, __LINE__, expr)
-#define P_CRITICAL_WITH_POS(expr, file, line) P_LOG(LVL_CRIT, file, line, expr)
-
-/**
- * Write the given expression, which represents a debugging message,
- * to the log stream.
- */
-#define P_DEBUG(expr) P_TRACE(1, expr)
-#define P_DEBUG_WITH_POS(file, line, expr) P_TRACE_WITH_POS(1, file, line, expr)
-
-#ifdef PASSENGER_DEBUG
-	#define P_TRACE(level, expr) P_LOG_UNLIKELY(LVL_INFO + level, __FILE__, __LINE__, expr)
-	#define P_TRACE_WITH_POS(level, file, line, expr) P_LOG_UNLIKELY(LVL_INFO + level, file, line, expr)
-#else
-	#define P_TRACE(level, expr) do { /* nothing */ } while (false)
-	#define P_TRACE_WITH_POS(level, file, line, expr) do { /* nothing */ } while (false)
-#endif
-
-
-/**
- * Log the fact that a file descriptor has been opened.
- */
-#define P_LOG_FILE_DESCRIPTOR_OPEN(fd) \
-	P_LOG_FILE_DESCRIPTOR_OPEN3(fd, __FILE__, __LINE__)
-#define P_LOG_FILE_DESCRIPTOR_OPEN2(fd, expr) \
-	P_LOG_FILE_DESCRIPTOR_OPEN4(fd, __FILE__, __LINE__, expr)
-#define P_LOG_FILE_DESCRIPTOR_OPEN3(fd, file, line) \
-	do { \
-		if (Passenger::hasFileDescriptorLogFile() || Passenger::getLogLevel() >= Passenger::LVL_DEBUG) { \
-			Passenger::FastStringStream<> _ostream; \
-			Passenger::_prepareLogEntry(_ostream, file, line); \
-			_ostream << "File descriptor opened: " << fd << "\n"; \
-			if (hasFileDescriptorLogFile()) { \
-				Passenger::_writeFileDescriptorLogEntry(_ostream.data(), _ostream.size()); \
-			} else { \
-				Passenger::_writeLogEntry(_ostream.data(), _ostream.size()); \
-			} \
-		} \
-	} while (false)
-#define P_LOG_FILE_DESCRIPTOR_OPEN4(fd, file, line, expr) \
-	do { \
-		P_LOG_FILE_DESCRIPTOR_OPEN3(fd, file, line); \
-		P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, expr); \
-	} while (false)
-
-/**
- * Log the purpose of a file descriptor that was recently logged with
- * P_LOG_FILE_DESCRIPTOR_OPEN(). You should include information that
- * allows a reader to find out what a file descriptor is for.
- */
-#define P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, expr) \
-	do { \
-		if (Passenger::hasFileDescriptorLogFile() || Passenger::getLogLevel() >= Passenger::LVL_DEBUG) { \
-			Passenger::FastStringStream<> _ostream; \
-			Passenger::_prepareLogEntry(_ostream, __FILE__, __LINE__); \
-			_ostream << "File descriptor purpose: " << fd << ": " << expr << "\n"; \
-			if (hasFileDescriptorLogFile()) { \
-				Passenger::_writeFileDescriptorLogEntry(_ostream.data(), _ostream.size()); \
-			} else { \
-				Passenger::_writeLogEntry(_ostream.data(), _ostream.size()); \
-			} \
-		} \
-	} while (false)
-
-/**
- * Log the fact that a file descriptor has been closed.
- */
-#define P_LOG_FILE_DESCRIPTOR_CLOSE(fd) \
-	do { \
-		if (Passenger::hasFileDescriptorLogFile() || Passenger::getLogLevel() >= Passenger::LVL_DEBUG) { \
-			Passenger::FastStringStream<> _ostream; \
-			Passenger::_prepareLogEntry(_ostream, __FILE__, __LINE__); \
-			_ostream << "File descriptor closed: " << fd << "\n"; \
-			if (hasFileDescriptorLogFile()) { \
-				Passenger::_writeFileDescriptorLogEntry(_ostream.data(), _ostream.size()); \
-			} else { \
-				Passenger::_writeLogEntry(_ostream.data(), _ostream.size()); \
-			} \
-		} \
-	} while (false)
-
-/**
- * Print a message that was received from an application's stdout/stderr.
- *
- * @param pid The application's PID.
- * @param channelName "stdout" or "stderr".
- * @param message The message that was received.
- */
-void printAppOutput(pid_t pid, const char *channelName, const char *message, unsigned int size);
-
-/**
- * Controls how messages that are received from applications are printed.
- *
- * If `enabled` is true then messages are printed using P_DEBUG, meaning that
- * the normal Passenger logging prefixes will be printed as well.
- *
- * If `enabled` is false (the default), then messages are printed directly
- * to the log output channel using write(), with only a very short prefix
- * that contains the PID and channel name.
- */
-void setPrintAppOutputAsDebuggingMessages(bool enabled);
-
-/** Print a [BUG] error message and abort with a stack trace. */
-#define P_BUG_WITH_FORMATTER_CODE(varname, code) \
-	do { \
-		TRACE_POINT(); \
-		const char *_exprStr; \
-		Passenger::FastStringStream<> varname; \
-		code \
-		_exprStr = Passenger::_strdupFastStringStream(varname); \
-		Passenger::lastAssertionFailure.filename = __FILE__; \
-		Passenger::lastAssertionFailure.line = __LINE__; \
-		Passenger::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
-		Passenger::lastAssertionFailure.expression = _exprStr; \
-		P_CRITICAL("[BUG] " << _exprStr); \
-		abort(); \
-	} while (false)
-
-#define P_BUG_UTP_WITH_FORMATTER_CODE(varname, code) \
-	do { \
-		UPDATE_TRACE_POINT(); \
-		const char *_exprStr; \
-		Passenger::FastStringStream<> varname; \
-		code \
-		_exprStr = Passenger::_strdupFastStringStream(varname); \
-		Passenger::lastAssertionFailure.filename = __FILE__; \
-		Passenger::lastAssertionFailure.line = __LINE__; \
-		Passenger::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
-		Passenger::lastAssertionFailure.expression = _exprStr; \
-		P_CRITICAL("[BUG] " << _exprStr); \
-		abort(); \
-	} while (false)
-
-#define P_BUG(expr) P_BUG_WITH_FORMATTER_CODE( _sstream , _sstream << expr; )
-#define P_BUG_UTP(expr) P_BUG_UTP_WITH_FORMATTER_CODE( _sstream , _sstream << expr; )
-
-#define P_ASSERT_EQ(value, expected) \
-	do { \
-		if (OXT_UNLIKELY(value != expected)) { \
-			P_BUG("Expected " << #value << " to be " << expected << ", got " << value); \
-		} \
-	} while (false)
-
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_LOGGING_H_ */