passenger 5.2.3 → 5.3.0

data/src/agent/Core/UnionStation/StopwatchLog.h

@@ -1,147 +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_UNION_STATION_STOPWATCH_LOG_H_
-#define _PASSENGER_UNION_STATION_STOPWATCH_LOG_H_
-
-#include <boost/noncopyable.hpp>
-
-#include <sys/resource.h>
-
-#include <string>
-
-#include <StaticString.h>
-#include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
-#include <Core/UnionStation/Transaction.h>
-
-namespace Passenger {
-namespace UnionStation {
-
-using namespace std;
-using namespace boost;
-
-
-class StopwatchLog: public noncopyable {
-private:
-	Transaction * const transaction;
-	const char *id;
-	bool ok;
-
-	static string timevalToString(struct timeval &tv) {
-		unsigned long long i = (unsigned long long) tv.tv_sec * 1000000 + tv.tv_usec;
-		return usecToString(i);
-	}
-
-	static string usecToString(unsigned long long usec) {
-		char timestamp[2 * sizeof(unsigned long long) + 1];
-		integerToHexatri<unsigned long long>(usec, timestamp);
-		return timestamp;
-	}
-
-public:
-	StopwatchLog()
-		: transaction(NULL)
-		{ }
-
-	StopwatchLog(const TransactionPtr &_transaction, const char *id, const char *nameAndData)
-		: transaction(_transaction.get())
-	{
-		this->id = id;
-		ok = false;
-
-		char message[250];
-		char *pos = message;
-		const char *end = message + sizeof(message);
-		struct rusage usage;
-
-		pos = appendData(pos, end, "BEGIN: ");
-		pos = appendData(pos, end, id);
-		pos = appendData(pos, end, " (");
-		pos = appendData(pos, end, usecToString(SystemTime::getMonotonicUsec()));
-		pos = appendData(pos, end, ",");
-		if (getrusage(RUSAGE_SELF, &usage) == -1) {
-			int e = errno;
-			throw SystemException("getrusage() failed", e);
-		}
-		pos = appendData(pos, end, timevalToString(usage.ru_utime));
-		pos = appendData(pos, end, ",");
-		pos = appendData(pos, end, timevalToString(usage.ru_stime));
-		pos = appendData(pos, end, ") ");
-
-		if (nameAndData != NULL) {
-			try {
-				pos = appendData(pos, end, modp::b64_encode(nameAndData));
-			} catch (const std::runtime_error &) {
-				// non-fatal: ignore
-			}
-		}
-
-		if (transaction != NULL) {
-			transaction->message(StaticString(message, pos - message));
-		}
-	}
-
-	~StopwatchLog() {
-		if (transaction == NULL) {
-			return;
-		}
-		char message[150];
-		char *pos = message;
-		const char *end = message + sizeof(message);
-		struct rusage usage;
-
-		if (ok) {
-			pos = appendData(pos, end, "END: ");
-		} else {
-			pos = appendData(pos, end, "FAIL: ");
-		}
-		pos = appendData(pos, end, id);
-		pos = appendData(pos, end, " (");
-		pos = appendData(pos, end, usecToString(SystemTime::getMonotonicUsec()));
-		pos = appendData(pos, end, ",");
-		if (getrusage(RUSAGE_SELF, &usage) == -1) {
-			int e = errno;
-			throw SystemException("getrusage() failed", e);
-		}
-		pos = appendData(pos, end, timevalToString(usage.ru_utime));
-		pos = appendData(pos, end, ",");
-		pos = appendData(pos, end, timevalToString(usage.ru_stime));
-		pos = appendData(pos, end, ")");
-
-		transaction->message(StaticString(message, pos - message));
-	}
-
-	void success() {
-		ok = true;
-	}
-};
-
-
-} // namespace UnionStation
-} // namespace Passenger
-
-#endif /* _PASSENGER_UNION_STATION_STOPWATCH_LOG_H_ */

data/src/agent/Core/UnionStation/Transaction.h

@@ -1,249 +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_UNION_STATION_TRANSACTION_H_
-#define _PASSENGER_UNION_STATION_TRANSACTION_H_
-
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
-#include <oxt/backtrace.hpp>
-
-#include <string>
-#include <stdexcept>
-
-#include <cstdio>
-#include <cassert>
-
-#include <LoggingKit/LoggingKit.h>
-#include <Exceptions.h>
-#include <StaticString.h>
-#include <Utils/IOUtils.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
-#include <Core/UnionStation/Connection.h>
-
-namespace Passenger {
-namespace UnionStation {
-
-using namespace std;
-using namespace boost;
-
-
-enum ExceptionHandlingMode {
-	PRINT,
-	THROW,
-	IGNORE
-};
-
-
-class Context;
-typedef boost::shared_ptr<Context> ContextPtr;
-
-inline void _checkinConnection(const ContextPtr &ctx, const ConnectionPtr &connection);
-
-
-class Transaction: public boost::noncopyable {
-private:
-	static const int INT64_STR_BUFSIZE = 22; // Long enough for a 64-bit number.
-	static const unsigned long long IO_TIMEOUT = 5000000; // In microseconds.
-
-	const ContextPtr context;
-	const ConnectionPtr connection;
-	const string txnId;
-	const string groupName;
-	const string category;
-	const string unionStationKey;
-	const ExceptionHandlingMode exceptionHandlingMode;
-
-	/**
-	 * Buffer must be at least txnId.size() + 1 + INT64_STR_BUFSIZE + 1 bytes.
-	 */
-	char *insertTxnIdAndTimestamp(char *buffer, const char *end) {
-		assert(end - buffer >= int(txnId.size() + 1 + INT64_STR_BUFSIZE + 1));
-		int size;
-
-		// "txn-id-here"
-		buffer = appendData(buffer, end, txnId);
-
-		// "txn-id-here "
-		buffer = appendData(buffer, end, " ", 1);
-
-		// "txn-id-here 123456"
-		assert(end - buffer >= INT64_STR_BUFSIZE);
-		size = snprintf(buffer, INT64_STR_BUFSIZE, "%llu", SystemTime::getUsec());
-		if (size >= INT64_STR_BUFSIZE) {
-			// The buffer is too small.
-			throw IOException("Cannot format a new transaction log message timestamp.");
-		}
-		buffer += size;
-
-		// "txn-id-here 123456 "
-		buffer = appendData(buffer, end, " ", 1);
-
-		return buffer;
-	}
-
-	template<typename ExceptionType>
-	void handleException(const ExceptionType &e) {
-		switch (exceptionHandlingMode) {
-		case THROW:
-			throw e;
-		case PRINT: {
-				const tracable_exception *te =
-					dynamic_cast<const tracable_exception *>(&e);
-				if (te != NULL) {
-					P_WARN(te->what() << "\n" << te->backtrace());
-				} else {
-					P_WARN(e.what());
-				}
-				break;
-			}
-		default:
-			break;
-		}
-	}
-
-public:
-	Transaction()
-		: exceptionHandlingMode(PRINT)
-		{ }
-
-	Transaction(const ContextPtr &_context,
-		const ConnectionPtr &_connection,
-		const string &_txnId,
-		const string &_groupName,
-		const string &_category,
-		const string &_unionStationKey,
-		ExceptionHandlingMode _exceptionHandlingMode = PRINT)
-		: context(_context),
-		  connection(_connection),
-		  txnId(_txnId),
-		  groupName(_groupName),
-		  category(_category),
-		  unionStationKey(_unionStationKey),
-		  exceptionHandlingMode(_exceptionHandlingMode)
-		{ }
-
-	~Transaction() {
-		TRACE_POINT();
-		if (connection == NULL) {
-			return;
-		}
-		ConnectionLock l(connection);
-		if (!connection->connected()) {
-			return;
-		}
-
-		char timestamp[2 * sizeof(unsigned long long) + 1];
-		integerToHexatri<unsigned long long>(SystemTime::getUsec(),
-			timestamp);
-
-		UPDATE_TRACE_POINT();
-		ConnectionGuard guard(connection.get());
-		try {
-			unsigned long long timeout = IO_TIMEOUT;
-			writeArrayMessage(connection->fd, &timeout,
-				"closeTransaction",
-				txnId.c_str(),
-				timestamp,
-				NULL);
-
-			_checkinConnection(context, connection);
-			guard.clear();
-		} catch (const SystemException &e) {
-			UPDATE_TRACE_POINT();
-			guard.clear();
-			connection->disconnect();
-			handleException(e);
-		}
-	}
-
-	void message(const StaticString &text) {
-		TRACE_POINT();
-		if (connection == NULL) {
-			P_TRACE(3, "[Union Station log to null] " << text);
-			return;
-		}
-		ConnectionLock l(connection);
-		if (!connection->connected()) {
-			P_TRACE(3, "[Union Station log to null] " << text);
-			return;
-		}
-
-		char timestamp[2 * sizeof(unsigned long long) + 1];
-		integerToHexatri<unsigned long long>(SystemTime::getUsec(), timestamp);
-
-		UPDATE_TRACE_POINT();
-		ConnectionGuard guard(connection.get());
-		try {
-			unsigned long long timeout = IO_TIMEOUT;
-			P_TRACE(3, "[Union Station log] " << txnId << " " << timestamp << " " << text);
-			writeArrayMessage(connection->fd, &timeout,
-				"log",
-				txnId.c_str(),
-				timestamp,
-				NULL);
-			writeScalarMessage(connection->fd, text, &timeout);
-			guard.clear();
-		} catch (const std::exception &e) {
-			UPDATE_TRACE_POINT();
-			guard.clear();
-			connection->disconnect();
-			handleException(e);
-		}
-	}
-
-	void abort(const StaticString &text) {
-		message("ABORT");
-	}
-
-	bool isNull() const {
-		return connection == NULL;
-	}
-
-	const string &getTxnId() const {
-		return txnId;
-	}
-
-	const string &getGroupName() const {
-		return groupName;
-	}
-
-	const string &getCategory() const {
-		return category;
-	}
-
-	const string &getUnionStationKey() const {
-		return unionStationKey;
-	}
-};
-
-typedef boost::shared_ptr<Transaction> TransactionPtr;
-
-
-} // namespace UnionStation
-} // namespace Passenger
-
-#endif /* _PASSENGER_UNION_STATION_TRANSACTION_H_ */

data/src/agent/SpawnPreparer/SpawnPreparerMain.cpp

@@ -1,208 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-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.
- */
-
-/*
- * Sets given environment variables, dumps the entire environment to
- * a given file (for diagnostics purposes), then execs the given command.
- *
- * This is a separate executable because it does quite
- * some non-async-signal-safe stuff that we can't do after
- * fork()ing from the Spawner and before exec()ing.
- */
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string>
-#include <sstream>
-#include <modp_b64.h>
-#include <Utils/SystemMetricsCollector.h>
-
-using namespace std;
-using namespace Passenger;
-
-extern "C" {
-	extern char **environ;
-}
-
-static void
-changeWorkingDir(const char *dir) {
-	int ret = chdir(dir);
-	if (ret == 0) {
-		setenv("PWD", dir, 1);
-	} else {
-		int e = errno;
-		printf("!> Error\n");
-		printf("!> \n");
-		printf("Unable to change working directory to '%s': %s (errno=%d)\n",
-			dir, strerror(e), e);
-		fflush(stdout);
-		exit(1);
-	}
-}
-
-static void
-setGivenEnvVars(const char *envvarsData) {
-	string envvars = modp::b64_decode(envvarsData);
-	const char *key = envvars.data();
-	const char *end = envvars.data() + envvars.size();
-
-	while (key < end) {
-		const char *keyEnd = (const char *) memchr(key, '\0', end - key);
-		if (keyEnd != NULL) {
-			const char *value = keyEnd + 1;
-			if (value < end) {
-				const char *valueEnd = (const char *) memchr(value, '\0', end - value);
-				if (valueEnd != NULL) {
-					setenv(key, value, 1);
-					key = valueEnd + 1;
-				} else {
-					break;
-				}
-			} else {
-				break;
-			}
-		} else {
-			break;
-		}
-	}
-}
-
-static void
-dumpInformation() {
-	const char *c_dir;
-	if ((c_dir = getenv("PASSENGER_DEBUG_DIR")) == NULL) {
-		return;
-	}
-
-	FILE *f;
-	string dir = c_dir;
-
-	f = fopen((dir + "/envvars").c_str(), "w");
-	if (f != NULL) {
-		int i = 0;
-		while (environ[i] != NULL) {
-			fputs(environ[i], f);
-			putc('\n', f);
-			i++;
-		}
-		fclose(f);
-	}
-
-	f = fopen((dir + "/user_info").c_str(), "w");
-	if (f != NULL) {
-		pid_t pid = fork();
-		if (pid == 0) {
-			dup2(fileno(f), 1);
-			execlp("id", "id", (char *) 0);
-			_exit(1);
-		} else if (pid == -1) {
-			int e = errno;
-			fprintf(stderr, "Error: cannot fork a new process: %s (errno=%d)\n",
-				strerror(e), e);
-		} else {
-			waitpid(pid, NULL, 0);
-		}
-		fclose(f);
-	}
-
-	f = fopen((dir + "/ulimit").c_str(), "w");
-	if (f != NULL) {
-		pid_t pid = fork();
-		if (pid == 0) {
-			dup2(fileno(f), 1);
-			execlp("ulimit", "ulimit", "-a", (char *) 0);
-			_exit(1);
-		} else if (pid == -1) {
-			int e = errno;
-			fprintf(stderr, "Error: cannot fork a new process: %s (errno=%d)\n",
-				strerror(e), e);
-		} else {
-			waitpid(pid, NULL, 0);
-		}
-		fclose(f);
-	}
-
-	SystemMetrics metrics;
-	bool collected = false;
-	try {
-		SystemMetricsCollector collector;
-		collector.collect(metrics);
-		usleep(50000); // Correct collect CPU metrics.
-		collector.collect(metrics);
-		collected = true;
-	} catch (const RuntimeException &e) {
-		fprintf(stderr, "Warning: %s\n", e.what());
-	}
-	if (collected) {
-		f = fopen((dir + "/system_metrics").c_str(), "w");
-		if (f != NULL) {
-			stringstream stream;
-			metrics.toDescription(stream);
-			string info = stream.str();
-
-			fwrite(info.data(), 1, info.size(), f);
-			fclose(f);
-		}
-	}
-}
-
-// Usage: PassengerAgent spawn-preparer <working directory> <envvars> <executable> <exec args...>
-int
-spawnPreparerMain(int argc, char *argv[]) {
-	#define ARG_OFFSET 1
-	if (argc < ARG_OFFSET + 5) {
-		fprintf(stderr, "Too few arguments.\n");
-		exit(1);
-	}
-
-	const char *workingDir = argv[ARG_OFFSET + 1];
-	const char *envvars = argv[ARG_OFFSET + 2];
-	const char *executable = argv[ARG_OFFSET + 3];
-	char **execArgs = &argv[ARG_OFFSET + 4];
-
-	changeWorkingDir(workingDir);
-	setGivenEnvVars(envvars);
-	dumpInformation();
-
-	// Print a newline just in case whatever executed us printed data
-	// without a newline. Otherwise the next process's "!> I have control"
-	// command will not be properly recognized.
-	// https://code.google.com/p/phusion-passenger/issues/detail?id=842#c16
-	printf("\n");
-	fflush(stdout);
-
-	execvp(executable, (char * const *) execArgs);
-	int e = errno;
-	fprintf(stderr, "*** ERROR ***: Cannot execute %s: %s (%d)\n",
-		executable, strerror(e), e);
-	return 1;
-}