passenger 5.2.3 → 5.3.0

data/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp

@@ -96,7 +96,7 @@ Group::getPallocPool() const {
 
 const ResourceLocator &
 Group::getResourceLocator() const {
-	return *getPool()->getSpawningKitConfig()->resourceLocator;
+	return *getPool()->getSpawningKitContext()->resourceLocator;
 }
 
 

data/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp

@@ -209,7 +209,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 
 		assert(process->oobwStatus == Process::OOBW_IN_PROGRESS);
 		assert(process->sessions == 0);
-		socket = process->findSessionSocketWithLowestBusyness();
+		socket = process->findSocketsAcceptingHttpRequestsAndWithLowestBusyness();
 	}
 
 	UPDATE_TRACE_POINT();

data/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp

@@ -96,14 +96,21 @@ Group::spawnThreadRealMain(const SpawningKit::SpawnerPtr &spawner,
 			boost::this_thread::restore_interruption ri(di);
 			boost::this_thread::restore_syscall_interruption rsi(dsi);
 			if (shouldFail) {
-				SpawnException e("Simulated failure");
-				processAndLogNewSpawnException(e, options, pool->getSpawningKitConfig());
-				throw e;
+				SpawningKit::Journey journey(SpawningKit::SPAWN_DIRECTLY, false);
+				SpawningKit::Config config;
+				journey.setStepErrored(SpawningKit::SPAWNING_KIT_PREPARATION, true);
+				SpawningKit::SpawnException e(SpawningKit::INTERNAL_ERROR,
+					journey, &config);
+				e.setSummary("Simulated failure");
+				throw e.finalize();
 			} else {
-				process = createProcessObject(spawner->spawn(options));
+				process = createProcessObject(*spawner, spawner->spawn(options));
 			}
-		} catch (const thread_interrupted &) {
+		} catch (const boost::thread_interrupted &) {
 			break;
+		} catch (SpawningKit::SpawnException &e) {
+			processAndLogNewSpawnException(e, options, pool->getContext());
+			exception = copyException(e);
 		} catch (const tracable_exception &e) {
 			exception = copyException(e);
 			// Let other (unexpected) exceptions crash the program so
@@ -316,7 +323,7 @@ Group::restart(const Options &options, RestartMethod method) {
 		boost::bind(&Group::finalizeRestart, this, shared_from_this(),
 			this->options.copyAndPersist().clearPerRequestFields(),
 			options.copyAndPersist().clearPerRequestFields(),
-			method, getContext()->getSpawningKitFactory(),
+			method, getContext()->spawningKitFactory,
 			restartsInitiated, actions),
 		"Group restarter: " + getName(),
 		POOL_HELPER_THREAD_STACK_SIZE

data/src/agent/Core/ApplicationPool/Implementation.cpp

@@ -45,8 +45,6 @@
 #include <Utils/JsonUtils.h>
 #include <Core/ApplicationPool/Pool.h>
 #include <Core/ApplicationPool/Group.h>
-#include <Core/ApplicationPool/Process.cpp>
-#include <Core/ApplicationPool/ErrorRenderer.h>
 #include <Core/ApplicationPool/Pool/InitializationAndShutdown.cpp>
 #include <Core/ApplicationPool/Pool/AnalyticsCollection.cpp>
 #include <Core/ApplicationPool/Pool/GarbageCollection.cpp>
@@ -65,6 +63,8 @@
 #include <Core/ApplicationPool/Group/InternalUtils.cpp>
 #include <Core/ApplicationPool/Group/StateInspection.cpp>
 #include <Core/ApplicationPool/Group/Verification.cpp>
+#include <Core/ApplicationPool/Process.cpp>
+#include <Core/SpawningKit/ErrorRenderer.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -95,7 +95,7 @@ copyException(const tracable_exception &e) {
 
 	TRY_COPY_EXCEPTION(RequestQueueFullException);
 	TRY_COPY_EXCEPTION(GetAbortedException);
-	TRY_COPY_EXCEPTION(SpawnException);
+	TRY_COPY_EXCEPTION(SpawningKit::SpawnException);
 
 	TRY_COPY_EXCEPTION(InvalidModeStringException);
 	TRY_COPY_EXCEPTION(ArgumentException);
@@ -135,7 +135,7 @@ rethrowException(const ExceptionPtr &e) {
 
 	TRY_RETHROW_EXCEPTION(ConfigurationException);
 
-	TRY_RETHROW_EXCEPTION(SpawnException);
+	TRY_RETHROW_EXCEPTION(SpawningKit::SpawnException);
 	TRY_RETHROW_EXCEPTION(RequestQueueFullException);
 	TRY_RETHROW_EXCEPTION(GetAbortedException);
 
@@ -165,47 +165,27 @@ rethrowException(const ExceptionPtr &e) {
 	throw tracable_exception(*e);
 }
 
-void processAndLogNewSpawnException(SpawnException &e, const Options &options,
-	const SpawningKit::ConfigPtr &config)
+void processAndLogNewSpawnException(SpawningKit::SpawnException &e, const Options &options,
+	const Context *context)
 {
 	TRACE_POINT();
-	UnionStation::TransactionPtr transaction;
-	ErrorRenderer renderer(*config->resourceLocator);
-	string appMessage = e.getErrorPage();
+	SpawningKit::ErrorRenderer renderer(*context->getSpawningKitContext());
 	string errorId;
 	char filename[PATH_MAX];
 	stringstream stream;
-
-	if (options.analytics && config->unionStationContext != NULL) {
-		try {
-			UPDATE_TRACE_POINT();
-			transaction = config->unionStationContext->newTransaction(
-				options.getAppGroupName(),
-				"exceptions",
-				options.unionStationKey);
-			errorId = transaction->getTxnId();
-		} catch (const tracable_exception &e2) {
-			transaction.reset();
-			P_WARN("Cannot log to Union Station: " << e2.what() <<
-				"\n  Backtrace:\n" << e2.backtrace());
-		}
-	}
+	string errorPage;
 
 	UPDATE_TRACE_POINT();
-	if (appMessage.empty()) {
-		appMessage = "none";
-	}
 	if (errorId.empty()) {
-		errorId = config->randomGenerator->generateHexString(4);
+		errorId = context->getRandomGenerator()->generateHexString(4);
 	}
-	e.set("error_id", errorId);
+	e.setId(errorId);
 
 	try {
 		int fd = -1;
-		string errorPage;
 
 		UPDATE_TRACE_POINT();
-		errorPage = renderer.renderWithDetails(appMessage, options, &e);
+		errorPage = renderer.renderWithDetails(e);
 
 		#if (defined(__linux__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 11))) || defined(__APPLE__) || defined(__FreeBSD__)
 			snprintf(filename, PATH_MAX, "%s/passenger-error-XXXXXX.html",
@@ -231,69 +211,6 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 			e2.backtrace());
 	}
 
-	if (transaction != NULL) {
-		try {
-			UPDATE_TRACE_POINT();
-			transaction->message("Context: spawning");
-			transaction->message("Message: " +
-				jsonString(e.what()));
-			transaction->message("App message: " +
-				jsonString(appMessage));
-
-			const char *kind;
-			switch (e.getErrorKind()) {
-			case SpawnException::PRELOADER_STARTUP_ERROR:
-				kind = "PRELOADER_STARTUP_ERROR";
-				break;
-			case SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR:
-				kind = "PRELOADER_STARTUP_PROTOCOL_ERROR";
-				break;
-			case SpawnException::PRELOADER_STARTUP_TIMEOUT:
-				kind = "PRELOADER_STARTUP_TIMEOUT";
-				break;
-			case SpawnException::PRELOADER_STARTUP_EXPLAINABLE_ERROR:
-				kind = "PRELOADER_STARTUP_EXPLAINABLE_ERROR";
-				break;
-			case SpawnException::APP_STARTUP_ERROR:
-				kind = "APP_STARTUP_ERROR";
-				break;
-			case SpawnException::APP_STARTUP_PROTOCOL_ERROR:
-				kind = "APP_STARTUP_PROTOCOL_ERROR";
-				break;
-			case SpawnException::APP_STARTUP_TIMEOUT:
-				kind = "APP_STARTUP_TIMEOUT";
-				break;
-			case SpawnException::APP_STARTUP_EXPLAINABLE_ERROR:
-				kind = "APP_STARTUP_EXPLAINABLE_ERROR";
-				break;
-			default:
-				kind = "UNDEFINED_ERROR";
-				break;
-			}
-			transaction->message(string("Kind: ") + kind);
-
-			Json::Value details;
-			const map<string, string> &annotations = e.getAnnotations();
-			map<string, string>::const_iterator it, end = annotations.end();
-
-			for (it = annotations.begin(); it != end; it++) {
-				details[it->first] = it->second;
-			}
-
-			// This information is not very useful. Union Station
-			// already collects system metrics.
-			details.removeMember("system_metrics");
-			// Don't include environment variables because they may
-			// contain sensitive information.
-			details.removeMember("envvars");
-
-			transaction->message("Details: " + stringifyJson(details));
-		} catch (const tracable_exception &e2) {
-			P_WARN("Cannot log to Union Station: " << e2.what() <<
-				"\n  Backtrace:\n" << e2.backtrace());
-		}
-	}
-
 	UPDATE_TRACE_POINT();
 	stream << "Could not spawn process for application " << options.appRoot <<
 		": " << e.what() << "\n" <<
@@ -301,21 +218,20 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 	if (filename[0] != '\0') {
 		stream << "  Error details saved to: " << filename << "\n";
 	}
-	stream << "  Message from application: " << appMessage << "\n";
 	P_ERROR(stream.str());
 
-	ScopedLock l(config->agentConfigSyncher);
-	if (!config->agentConfig.isNull()) {
+	ScopedLock l(context->agentConfigSyncher);
+	if (!context->agentConfig.isNull()) {
 		HookScriptOptions hOptions;
 		hOptions.name = "spawn_failed";
-		hOptions.spec = config->agentConfig.get("hook_spawn_failed", Json::Value()).asString();
-		hOptions.agentConfig = config->agentConfig;
+		hOptions.spec = context->agentConfig.get("hook_spawn_failed", Json::Value()).asString();
+		hOptions.agentConfig = context->agentConfig;
 		l.unlock();
 		hOptions.environment.push_back(make_pair("PASSENGER_APP_ROOT", options.appRoot));
 		hOptions.environment.push_back(make_pair("PASSENGER_APP_GROUP_NAME", options.getAppGroupName()));
 		hOptions.environment.push_back(make_pair("PASSENGER_ERROR_MESSAGE", e.what()));
 		hOptions.environment.push_back(make_pair("PASSENGER_ERROR_ID", errorId));
-		hOptions.environment.push_back(make_pair("PASSENGER_APP_ERROR_MESSAGE", appMessage));
+		hOptions.environment.push_back(make_pair("PASSENGER_ERROR_PAGE", errorPage));
 		oxt::thread(boost::bind(runHookScripts, hOptions),
 			"Hook: spawn_failed", 256 * 1024);
 	}

data/src/agent/Core/ApplicationPool/Options.h

@@ -37,8 +37,6 @@
 #include <StaticString.h>
 #include <FileTools/PathManip.h>
 #include <Utils.h>
-#include <Core/UnionStation/Context.h>
-#include <Core/UnionStation/Transaction.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -112,14 +110,10 @@ private:
 		result.push_back(&options.meteorAppSettings);
 
 		result.push_back(&options.environmentVariables);
-		result.push_back(&options.ustRouterAddress);
-		result.push_back(&options.ustRouterUsername);
-		result.push_back(&options.ustRouterPassword);
 		result.push_back(&options.apiKey);
 		result.push_back(&options.groupUuid);
 		result.push_back(&options.hostName);
 		result.push_back(&options.uri);
-		result.push_back(&options.unionStationKey);
 
 		return result;
 	}
@@ -311,23 +305,6 @@ public:
 
 	bool userSwitching;
 
-	/** Whether Union Station logging should be enabled. Enabling this option will
-	 * result in:
-	 *
-	 *  - The application enabling its Union Station support.
-	 *  - Periodic tasks such as `collectAnalytics()` to log things to Union Station.
-	 *
-	 * It does *not* necessarily result in a request logging data to Union Station.
-	 * That depends on whether the `transaction` member is set.
-	 *
-	 * If this is set to true, then 'ustRouterAddress', 'ustRouterUsername'
-	 * and 'ustRouterPassword' must be non-empty.
-	 */
-	bool analytics;
-	StaticString ustRouterAddress;
-	StaticString ustRouterUsername;
-	StaticString ustRouterPassword;
-
 	/**
 	 * Whether Spawner should raise an internal error when spawning. Used
 	 * during unit tests.
@@ -376,19 +353,6 @@ public:
 	 */
 	bool abortWebsocketsOnProcessShutdown;
 
-	/**
-	 * The Union Station key to use in case analytics logging is enabled.
-	 * It is used by Pool::collectAnalytics() and other administrative
-	 * functions which are called periodically. Because they do not belong
-	 * to any request, and they may still want to log to Union Station,
-	 * this key is stored in the per-group options structure.
-	 *
-	 * It is not used on a per-request basis. Per-request analytics logging
-	 * (and Union Station logging) uses the logger object in the `logger` field
-	 * instead.
-	 */
-	StaticString unionStationKey;
-
 	/*-----------------*/
 
 
@@ -404,18 +368,6 @@ public:
 	/** Current request URI. */
 	StaticString uri;
 
-	/**
-	 * The Union Station log transaction that this request belongs to.
-	 * May be the null pointer, in which case Union Station logging is
-	 * disabled for this request.
-	 *
-	 * When an Options object is passed to another thread (either direct or through
-	 * a copy), the caller should call `detachFromUnionStationTransaction()`.
-	 * Each Union Station transaction object is only supposed to be used in the same
-	 * thread.
-	 */
-	UnionStation::TransactionPtr transaction;
-
 	/**
 	 * A sticky session ID for routing to a specific process.
 	 */
@@ -493,7 +445,6 @@ public:
 		  debugger(false),
 		  loadShellEnvvars(true),
 		  userSwitching(true),
-		  analytics(false),
 		  raiseInternalError(false),
 
 		  minProcesses(1),
@@ -579,11 +530,6 @@ public:
 		stickySessionId = 0;
 		currentTime     = 0;
 		noop     = false;
-		return detachFromUnionStationTransaction();
-	}
-
-	Options &detachFromUnionStationTransaction() {
-		transaction.reset();
 		return *this;
 	}
 
@@ -626,11 +572,7 @@ public:
 			appendKeyValue (vec, "python",             python);
 			appendKeyValue (vec, "nodejs",             nodejs);
 			appendKeyValue (vec, "meteor_app_settings", meteorAppSettings);
-			appendKeyValue (vec, "ust_router_address",  ustRouterAddress);
-			appendKeyValue (vec, "ust_router_username", ustRouterUsername);
-			appendKeyValue (vec, "ust_router_password", ustRouterPassword);
 			appendKeyValue4(vec, "debugger",           debugger);
-			appendKeyValue4(vec, "analytics",          analytics);
 			appendKeyValue (vec, "api_key",            apiKey);
 
 			/*********************************/
@@ -641,9 +583,6 @@ public:
 			appendKeyValue2(vec, "max_preloader_idle_time", maxPreloaderIdleTime);
 			appendKeyValue3(vec, "max_out_of_band_work_instances", maxOutOfBandWorkInstances);
 		}
-		if ((fields & SPAWN_OPTIONS) || (fields & PER_GROUP_POOL_OPTIONS)) {
-			appendKeyValue (vec, "union_station_key",   unionStationKey);
-		}
 
 		/*********************************/
 	}
@@ -677,13 +616,17 @@ public:
 
 	string getStartCommand(const ResourceLocator &resourceLocator) const {
 		if (appType == P_STATIC_STRING("rack")) {
-			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/rack-loader.rb";
+			return escapeShell(ruby) + " "
+				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/rack-loader.rb");
 		} else if (appType == P_STATIC_STRING("wsgi")) {
-			return python + "\t" + resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py";
+			return escapeShell(python) + " "
+				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py");
 		} else if (appType == P_STATIC_STRING("node")) {
-			return nodejs + "\t" + resourceLocator.getHelperScriptsDir() + "/node-loader.js";
+			return escapeShell(nodejs) + " "
+				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/node-loader.js");
 		} else if (appType == P_STATIC_STRING("meteor")) {
-			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb";
+			return escapeShell(ruby) + " "
+				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb");
 		} else {
 			return startCommand;
 		}

data/src/agent/Core/ApplicationPool/Pool.h

@@ -59,7 +59,6 @@
 #include <Utils/VariantMap.h>
 #include <Utils/ProcessMetricsCollector.h>
 #include <Utils/SystemMetricsCollector.h>
-#include <Core/UnionStation/StopwatchLog.h>
 #include <Core/ApplicationPool/Common.h>
 #include <Core/ApplicationPool/Context.h>
 #include <Core/ApplicationPool/Process.h>
@@ -211,7 +210,7 @@ public:
 	unsigned long long maxIdleTime;
 	bool selfchecking;
 
-	Context context;
+	Context *context;
 
 	/**
 	 * Code can register background threads in one of these dynamic thread groups
@@ -273,8 +272,6 @@ public:
 	 */
 	vector<GetWaiter> getWaitlist;
 
-	Json::Value agentConfig;
-
 // Actually private, but marked public so that unit tests can access the fields.
 public:
 	/****** Debugging support *******/
@@ -315,13 +312,6 @@ public:
 
 	/****** Analytics collection ******/
 
-	struct UnionStationLogEntry {
-		string groupName;
-		const char *category;
-		string key;
-		string data;
-	};
-
 	SystemMetricsCollector systemMetricsCollector;
 	SystemMetrics systemMetrics;
 
@@ -331,10 +321,6 @@ public:
 	static void updateProcessMetrics(const ProcessList &processes,
 		const ProcessMetricMap &allMetrics,
 		vector<ProcessPtr> &processesToDetach);
-	void prepareUnionStationProcessStateLogs(vector<UnionStationLogEntry> &logEntries,
-		const GroupPtr &group) const;
-	void prepareUnionStationSystemMetricsLogs(vector<UnionStationLogEntry> &logEntries,
-		const GroupPtr &group) const;
 	void realCollectAnalytics();
 
 
@@ -448,8 +434,7 @@ public:
 
 	/****** Initialization and shutdown ******/
 
-	Pool(const SpawningKit::FactoryPtr &spawningKitFactory,
-		const Json::Value &agentConfig = Json::Value());
+	Pool(Context *context);
 	~Pool();
 	void initialize();
 	void initDebugging();
@@ -460,8 +445,7 @@ public:
 	/****** General utilities ******/
 
 	Context *getContext();
-	const SpawningKit::ConfigPtr &getSpawningKitConfig() const;
-	const UnionStation::ContextPtr &getUnionStationContext() const;
+	SpawningKit::Context *getSpawningKitContext() const;
 	const RandomGeneratorPtr &getRandomGenerator() const;
 
 
@@ -506,12 +490,11 @@ public:
 
 	/****** Miscellaneous ******/
 
-	void asyncGet(const Options &options, const GetCallback &callback, bool lockNow = true, UnionStation::StopwatchLog **stopwatchLog = NULL);
+	void asyncGet(const Options &options, const GetCallback &callback, bool lockNow = true);
 	SessionPtr get(const Options &options, Ticket *ticket);
 	void setMax(unsigned int max);
 	void setMaxIdleTime(unsigned long long value);
 	void enableSelfChecking(bool enabled);
-	void setAgentConfig(const Json::Value &agentConfig);
 	bool isSpawning(bool lock = true) const;
 	bool authorizeByApiKey(const ApiKey &key, bool lock = true) const;
 	bool authorizeByUid(uid_t uid, bool lock = true) const;