passenger 5.1.7 → 5.1.8

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -808,7 +808,7 @@ Controller::sendResponseHeaderWithWritev(Client *client, Request *req,
 {
 	TRACE_POINT();
 
-	if (OXT_UNLIKELY(mainConfigCache.benchmarkMode == BM_RESPONSE_BEGIN)) {
+	if (OXT_UNLIKELY(mainConfig.benchmarkMode == BM_RESPONSE_BEGIN)) {
 		writeBenchmarkResponse(&client, &req, false);
 		return true;
 	}
@@ -887,7 +887,7 @@ void
 Controller::logResponseHeaders(Client *client, Request *req, struct iovec *buffers,
 	unsigned int nbuffers, unsigned int dataSize)
 {
-	if (OXT_UNLIKELY(getLogLevel() >= LVL_DEBUG3)) {
+	if (OXT_UNLIKELY(LoggingKit::getLevel() >= LoggingKit::DEBUG3)) {
 		TRACE_POINT();
 		char *buffer = (char *) psg_pnalloc(req->pool, dataSize);
 		gatherBuffers(buffer, dataSize, buffers, nbuffers);
@@ -983,7 +983,7 @@ void
 Controller::writeResponseAndMarkForTurboCaching(Client *client, Request *req,
 	const MemoryKit::mbuf &buffer)
 {
-	if (OXT_LIKELY(mainConfigCache.benchmarkMode != BM_RESPONSE_BEGIN)) {
+	if (OXT_LIKELY(mainConfig.benchmarkMode != BM_RESPONSE_BEGIN)) {
 		writeResponse(client, buffer);
 	}
 	markResponsePartForTurboCaching(client, req, buffer);
@@ -1015,8 +1015,8 @@ Controller::maybeThrottleAppSource(Client *client, Request *req) {
 	if (!req->ended()) {
 		assert(client->output.getBuffersFlushedCallback() == NULL);
 		assert(client->output.getDataFlushedCallback() == getClientOutputDataFlushedCallback());
-		if (mainConfigCache.responseBufferHighWatermark > 0
-		 && client->output.getTotalBytesBuffered() >= mainConfigCache.responseBufferHighWatermark)
+		if (mainConfig.responseBufferHighWatermark > 0
+		 && client->output.getTotalBytesBuffered() >= mainConfig.responseBufferHighWatermark)
 		{
 			SKC_TRACE(client, 2, "Application is sending response data quicker than the client "
 				"can keep up with. Throttling application socket");

data/src/agent/Core/Controller/Hooks.cpp

@@ -135,7 +135,7 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 	req->strip100ContinueHeader = false;
 	req->hasPragmaHeader = false;
 	req->host = NULL;
-	req->configCache = requestConfigCache;
+	req->config = requestConfig;
 	req->bodyBytesBuffered = 0;
 	req->cacheKey = HashedStaticString();
 	req->cacheControl = NULL;
@@ -155,7 +155,7 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 void
 Controller::deinitializeRequest(Client *client, Request *req) {
 	req->session.reset();
-	req->configCache.reset();
+	req->config.reset();
 
 	req->endStopwatchLog(&req->stopwatchLogs.getFromPool, false);
 	req->endStopwatchLog(&req->stopwatchLogs.bufferingRequestBody, false);
@@ -277,7 +277,7 @@ Controller::onNextRequestEarlyReadError(Client *client, Request *req, int errcod
 bool
 Controller::shouldDisconnectClientOnShutdown(Client *client) {
 	return ParentClass::shouldDisconnectClientOnShutdown(client)
-		|| !mainConfigCache.gracefulExit;
+		|| !mainConfig.gracefulExit;
 }
 
 bool
@@ -285,15 +285,6 @@ Controller::supportsUpgrade(Client *client, Request *req) {
 	return true;
 }
 
-void
-Controller::onConfigChange(const ConfigKit::Store *oldConfig) {
-	ParentClass::onConfigChange(oldConfig);
-	mainConfigCache.update(config);
-	requestConfigCache.reset(new ControllerRequestConfigCache(config));
-	getContext()->defaultFileBufferedChannelConfig.bufferDir =
-		config["data_buffer_dir"].asString();
-}
-
 
 /****************************
  *
@@ -308,7 +299,7 @@ Controller::getClientName(const Client *client, char *buf, size_t size) const {
 	const char *end = buf + size - 1;
 	// WARNING: If you change the format, be sure to change
 	// ApiServer::extractThreadNumberFromClientName() too.
-	pos += uintToString(mainConfigCache.threadNumber, pos, end - pos);
+	pos += uintToString(mainConfig.threadNumber, pos, end - pos);
 	pos = appendData(pos, end, "-", 1);
 	pos += uintToString(client->number, pos, end - pos);
 	*pos = '\0';
@@ -317,7 +308,7 @@ Controller::getClientName(const Client *client, char *buf, size_t size) const {
 
 StaticString
 Controller::getServerName() const {
-	return mainConfigCache.serverLogName;
+	return mainConfig.serverLogName;
 }
 
 

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

@@ -34,5 +34,5 @@
 #include <Core/Controller/InitializationAndShutdown.cpp>
 #include <Core/Controller/InternalUtils.cpp>
 #include <Core/Controller/Miscellaneous.cpp>
+#include <Core/Controller/Config.cpp>
 #include <Core/Controller/StateInspection.cpp>
-

data/src/agent/Core/Controller/InitRequest.cpp

@@ -82,7 +82,7 @@ Controller::initializeFlags(Client *client, Request *req, RequestAnalysis &analy
 			part = part->next;
 		}
 
-		if (OXT_UNLIKELY(getLogLevel() >= LVL_DEBUG2)) {
+		if (OXT_UNLIKELY(LoggingKit::getLevel() >= LoggingKit::DEBUG2)) {
 			if (req->dechunkResponse) {
 				SKC_TRACE(client, 2, "Dechunk flag detected");
 			}
@@ -136,7 +136,7 @@ void
 Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis &analysis) {
 	boost::shared_ptr<Options> *options;
 
-	if (req->configCache->singleAppMode) {
+	if (req->config->singleAppMode) {
 		P_ASSERT_EQ(poolOptionsCache.size(), 1);
 		poolOptionsCache.lookupRandom(NULL, &options);
 		req->options = **options;
@@ -172,36 +172,38 @@ Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis
 				req->envvars->size);
 		}
 
+		// Allow certain options to be overriden on a per-request basis
 		fillPoolOption(req, req->options.maxRequests, PASSENGER_MAX_REQUESTS);
 	}
 }
 
 void
 Controller::fillPoolOptionsFromConfigCaches(Options &options,
-	const ControllerRequestConfigCachePtr &requestConfigCache)
+	psg_pool_t *pool, const ControllerRequestConfigPtr &requestConfig)
 {
-	options.ruby = requestConfigCache->defaultRuby;
-	options.nodejs = requestConfigCache->defaultNodejs;
-	options.python = requestConfigCache->defaultPython;
-	options.meteorAppSettings = requestConfigCache->meteorAppSettings;
-	options.fileDescriptorUlimit = requestConfigCache->fileDescriptorUlimit;
-
-	options.logLevel = getLogLevel();
-	options.integrationMode = mainConfigCache.integrationMode;
-	options.ustRouterAddress = requestConfigCache->ustRouterAddress;
+	options.ruby = requestConfig->defaultRuby;
+	options.nodejs = requestConfig->defaultNodejs;
+	options.python = requestConfig->defaultPython;
+	options.meteorAppSettings = requestConfig->meteorAppSettings;
+	options.fileDescriptorUlimit = requestConfig->fileDescriptorUlimit;
+
+	options.logLevel = int(LoggingKit::getLevel());
+	options.integrationMode = psg_pstrdup(pool, mainConfig.integrationMode);
+	options.ustRouterAddress = requestConfig->ustRouterAddress;
 	options.ustRouterUsername = P_STATIC_STRING("logging");
-	options.ustRouterPassword = requestConfigCache->ustRouterPassword;
-	options.userSwitching = mainConfigCache.userSwitching;
-	options.defaultUser = requestConfigCache->defaultUser;
-	options.defaultGroup = requestConfigCache->defaultGroup;
-	options.minProcesses = requestConfigCache->minInstances;
-	options.maxPreloaderIdleTime = requestConfigCache->maxPreloaderIdleTime;
-	options.maxRequestQueueSize = requestConfigCache->maxRequestQueueSize;
-	options.abortWebsocketsOnProcessShutdown = requestConfigCache->abortWebsocketsOnProcessShutdown;
-	options.forceMaxConcurrentRequestsPerProcess = requestConfigCache->forceMaxConcurrentRequestsPerProcess;
-	options.spawnMethod = requestConfigCache->spawnMethod;
-	options.loadShellEnvvars = requestConfigCache->loadShellEnvvars;
-	options.statThrottleRate = mainConfigCache.statThrottleRate;
+	options.ustRouterPassword = requestConfig->ustRouterPassword;
+	options.userSwitching = mainConfig.userSwitching;
+	options.defaultUser = requestConfig->defaultUser;
+	options.defaultGroup = requestConfig->defaultGroup;
+	options.minProcesses = requestConfig->minInstances;
+	options.maxPreloaderIdleTime = requestConfig->maxPreloaderIdleTime;
+	options.maxRequestQueueSize = requestConfig->maxRequestQueueSize;
+	options.abortWebsocketsOnProcessShutdown = requestConfig->abortWebsocketsOnProcessShutdown;
+	options.forceMaxConcurrentRequestsPerProcess = requestConfig->forceMaxConcurrentRequestsPerProcess;
+	options.spawnMethod = requestConfig->spawnMethod;
+	options.loadShellEnvvars = requestConfig->loadShellEnvvars;
+	options.statThrottleRate = mainConfig.statThrottleRate;
+	options.maxRequests = requestConfig->maxRequests;
 
 	/******************************/
 }
@@ -333,7 +335,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 		options.baseURI = StaticString(scriptName->start->data, scriptName->size);
 	}
 
-	fillPoolOptionsFromConfigCaches(options, req->configCache);
+	fillPoolOptionsFromConfigCaches(options, req->pool, req->config);
 
 	const LString *appType = secureHeaders.lookup("!~PASSENGER_APP_TYPE");
 	if (appType == NULL || appType->size == 0) {
@@ -446,7 +448,7 @@ Controller::getStickySessionCookieName(Request *req) {
 	const LString *value = req->headers.lookup(PASSENGER_STICKY_SESSIONS_COOKIE_NAME);
 	if (value == NULL || value->size == 0) {
 		return psg_lstr_create(req->pool,
-			req->configCache->defaultStickySessionsCookieName);
+			req->config->defaultStickySessionsCookieName);
 	} else {
 		return value;
 	}
@@ -471,15 +473,15 @@ Controller::onRequestBegin(Client *client, Request *req) {
 		// and localize them as much as possible, for better CPU caching.
 		RequestAnalysis analysis;
 		analysis.flags = req->secureHeaders.lookup(FLAGS);
-		analysis.appGroupNameCell = req->configCache->singleAppMode
+		analysis.appGroupNameCell = req->config->singleAppMode
 			? NULL
 			: req->secureHeaders.lookupCell(PASSENGER_APP_GROUP_NAME);
 		analysis.unionStationSupport = unionStationContext != NULL
 			&& getBoolOption(req, UNION_STATION_SUPPORT, false);
 		req->stickySession = getBoolOption(req, PASSENGER_STICKY_SESSIONS,
-			mainConfigCache.stickySessions);
+			mainConfig.stickySessions);
 		req->showVersionInHeader = getBoolOption(req, PASSENGER_SHOW_VERSION_IN_HEADER,
-			req->configCache->showVersionInHeader);
+			req->config->showVersionInHeader);
 		req->host = req->headers.lookup(HTTP_HOST);
 
 		/***************/

data/src/agent/Core/Controller/InitializationAndShutdown.cpp

@@ -49,8 +49,8 @@ Controller::Controller(ServerKit::Context *context, const ControllerSchema &sche
 	const Json::Value &initialConfig)
 	: ParentClass(context, schema, initialConfig),
 
-	  mainConfigCache(config),
-	  requestConfigCache(new ControllerRequestConfigCache(config)),
+	  mainConfig(config),
+	  requestConfig(new ControllerRequestConfig(config)),
 	  poolOptionsCache(4),
 
 	  PASSENGER_APP_GROUP_NAME("!~PASSENGER_APP_GROUP_NAME"),
@@ -115,9 +115,9 @@ Controller::initialize() {
 	getContext()->defaultFileBufferedChannelConfig.bufferDir =
 		config["data_buffer_dir"].asString();
 
-	if (requestConfigCache->singleAppMode) {
+	if (requestConfig->singleAppMode) {
 		boost::shared_ptr<Options> options = boost::make_shared<Options>();
-		fillPoolOptionsFromConfigCaches(*options, requestConfigCache);
+		fillPoolOptionsFromConfigCaches(*options, mainConfig.pool, requestConfig);
 
 		string appRoot = config["app_root"].asString();
 		string environment = config["environment"].asString();

data/src/agent/Core/Controller/InternalUtils.cpp

@@ -48,14 +48,14 @@ using namespace boost;
 void
 Controller::disconnectWithClientSocketWriteError(Client **client, int e) {
 	stringstream message;
-	PassengerLogLevel logLevel;
+	LoggingKit::Level logLevel;
 	message << "client socket write error: ";
 	message << ServerKit::getErrorDesc(e);
 	message << " (errno=" << e << ")";
 	if (e == EPIPE || e == ECONNRESET) {
-		logLevel = LVL_INFO;
+		logLevel = LoggingKit::INFO;
 	} else {
-		logLevel = LVL_WARN;
+		logLevel = LoggingKit::WARN;
 	}
 	disconnectWithError(client, message.str(), logLevel);
 }

data/src/agent/Core/Controller/Miscellaneous.cpp

@@ -63,7 +63,7 @@ Controller::disconnectLongRunningConnections(const StaticString &gupid) {
 			 && req->session != NULL
 			 && req->session->getGupid() == gupid)
 			{
-				if (getLogLevel() >= LVL_INFO) {
+				if (LoggingKit::getLevel() >= LoggingKit::INFO) {
 					char clientName[32];
 					unsigned int size;
 					const LString *host;

data/src/agent/Core/Controller/Request.h

@@ -33,7 +33,7 @@
 #include <ServerKit/HttpRequest.h>
 #include <ServerKit/FdSinkChannel.h>
 #include <ServerKit/FdSourceChannel.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Core/ApplicationPool/Pool.h>
 #include <Core/UnionStation/Context.h>
 #include <Core/UnionStation/Transaction.h>
@@ -86,7 +86,7 @@ public:
 	Options options;
 	AbstractSessionPtr session;
 	const LString *host;
-	ControllerRequestConfigCachePtr configCache;
+	ControllerRequestConfigPtr config;
 
 	ServerKit::FdSinkChannel appSink;
 	ServerKit::FdSourceChannel appSource;

data/src/agent/Core/Controller/SendRequest.cpp

@@ -393,8 +393,8 @@ Controller::determineHeaderSizeForSessionProtocol(Request *req,
 			}
 		}
 	} else {
-		state.serverName = req->configCache->defaultServerName;
-		state.serverPort = req->configCache->defaultServerPort;
+		state.serverName = req->config->defaultServerName;
+		state.serverPort = req->config->defaultServerPort;
 	}
 
 	dataSize += sizeof("SERVER_NAME");
@@ -404,7 +404,7 @@ Controller::determineHeaderSizeForSessionProtocol(Request *req,
 	dataSize += state.serverPort.size() + 1;
 
 	dataSize += sizeof("SERVER_SOFTWARE");
-	dataSize += req->configCache->serverSoftware.size() + 1;
+	dataSize += req->config->serverSoftware.size() + 1;
 
 	dataSize += sizeof("SERVER_PROTOCOL");
 	dataSize += sizeof("HTTP/1.1");
@@ -515,7 +515,7 @@ Controller::constructHeaderForSessionProtocol(Request *req, char * restrict buff
 	pos = appendData(pos, end, "", 1);
 
 	pos = appendData(pos, end, P_STATIC_STRING_WITH_NULL("SERVER_SOFTWARE"));
-	pos = appendData(pos, end, req->configCache->serverSoftware);
+	pos = appendData(pos, end, req->config->serverSoftware);
 	pos = appendData(pos, end, "", 1);
 
 	pos = appendData(pos, end, P_STATIC_STRING_WITH_NULL("SERVER_PROTOCOL"));
@@ -635,7 +635,7 @@ Controller::sendHeaderToAppWithHttpProtocol(Client *client, Request *req) {
 
 	cache.cached = false;
 
-	if (OXT_UNLIKELY(getLogLevel() >= LVL_DEBUG3)) {
+	if (OXT_UNLIKELY(LoggingKit::getLevel() >= LoggingKit::DEBUG3)) {
 		struct iovec *buffers;
 		unsigned int nbuffers, dataSize;
 		bool ok;

data/src/agent/Core/Controller/StateInspection.cpp

@@ -48,7 +48,7 @@ using namespace boost;
 
 unsigned int
 Controller::getThreadNumber() const {
-	return mainConfigCache.threadNumber;
+	return mainConfig.threadNumber;
 }
 
 Json::Value

data/src/agent/Core/Controller/TurboCaching.h

@@ -34,7 +34,7 @@
 #include <MemoryKit/mbuf.h>
 #include <ServerKit/Context.h>
 #include <Constants.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Utils/StrIntUtils.h>
 #include <Core/ResponseCache.h>
 
@@ -113,7 +113,7 @@ private:
 
 		prep.ageValueSize = integerSizeInOtherBase<time_t, 10>(prep.age);
 		prep.contentLengthStrSize = uintSizeAsString(entry.body->httpBodySize);
-		prep.showVersionInHeader = req->configCache->showVersionInHeader;
+		prep.showVersionInHeader = req->config->showVersionInHeader;
 	}
 
 	template<typename Server>

data/src/agent/Core/CoreMain.cpp

@@ -678,6 +678,8 @@ initializeNonPrivilegedWorkingObjects() {
 		Json::Value config = ConfigKit::variantMapToJson(wo->controllerSchema,
 			*agentsOptions);
 		config["thread_number"] = i + 1;
+		config["min_spare_clients"] = 128;
+		config["client_freelist_limit"] = 1024;
 
 		if (i == 0) {
 			two.bgloop = firstLoop = new BackgroundEventLoop(true, true);
@@ -697,8 +699,6 @@ initializeNonPrivilegedWorkingObjects() {
 		UPDATE_TRACE_POINT();
 		two.controller = new Core::Controller(two.serverKitContext,
 			wo->controllerSchema, config);
-		two.controller->minSpareClients = 128;
-		two.controller->clientFreelistLimit = 1024;
 		two.controller->resourceLocator = &wo->resourceLocator;
 		two.controller->appPool = wo->appPool;
 		two.controller->unionStationContext = wo->unionStationContext;

data/src/agent/Core/ResponseCache.h

@@ -492,12 +492,12 @@ public:
 		}
 
 		LString *varyCookieName = req->secureHeaders.lookup(PASSENGER_VARY_TURBOCACHE_BY_COOKIE);
-		if (varyCookieName == NULL && !req->configCache->defaultVaryTurbocacheByCookie.empty()) {
+		if (varyCookieName == NULL && !req->config->defaultVaryTurbocacheByCookie.empty()) {
 			varyCookieName = (LString *) psg_palloc(req->pool, sizeof(LString));
 			psg_lstr_init(varyCookieName);
 			psg_lstr_append(varyCookieName, req->pool,
-				req->configCache->defaultVaryTurbocacheByCookie.data(),
-				req->configCache->defaultVaryTurbocacheByCookie.size());
+				req->config->defaultVaryTurbocacheByCookie.data(),
+				req->config->defaultVaryTurbocacheByCookie.size());
 		}
 		if (varyCookieName != NULL) {
 			LString *cookieHeader = req->headers.lookup(COOKIE);

data/src/agent/Core/SpawningKit/BackgroundIOCapturer.h

@@ -37,7 +37,7 @@
 
 #include <sys/types.h>
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <FileDescriptor.h>
 #include <StaticString.h>
 #include <Utils.h>
@@ -89,7 +89,7 @@ private:
 				}
 				UPDATE_TRACE_POINT();
 				if (ret == 1 && buf[0] == '\n') {
-					printAppOutput(pid, channelName, "", 0);
+					LoggingKit::logAppOutput(pid, channelName, "", 0);
 				} else {
 					vector<StaticString> lines;
 					if (ret > 0 && buf[ret - 1] == '\n') {
@@ -97,7 +97,7 @@ private:
 					}
 					split(StaticString(buf, ret), '\n', lines);
 					foreach (const StaticString line, lines) {
-						printAppOutput(pid, channelName, line.data(), line.size());
+						LoggingKit::logAppOutput(pid, channelName, line.data(), line.size());
 					}
 				}
 			}

data/src/agent/Core/SpawningKit/DirectSpawner.h

@@ -28,7 +28,7 @@
 
 #include <Core/SpawningKit/Spawner.h>
 #include <Constants.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <LveLoggingDecorator.h>
 #include <limits.h>  // for PTHREAD_STACK_MIN
 #include <pthread.h>
@@ -127,7 +127,7 @@ private:
 		if (shouldLoadShellEnvvars(options, preparation)) {
 			command.push_back(preparation.userSwitching.shell);
 			command.push_back(preparation.userSwitching.shell);
-			if (Passenger::getLogLevel() >= LVL_DEBUG3) {
+			if (LoggingKit::getLevel() >= LoggingKit::DEBUG3) {
 				command.push_back("-lxc");
 			} else {
 				command.push_back("-lc");

data/src/agent/Core/SpawningKit/PipeWatcher.h

@@ -40,7 +40,7 @@
 
 #include <FileDescriptor.h>
 #include <Constants.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
 #include <Core/SpawningKit/Config.h>
@@ -97,7 +97,7 @@ private:
 				}
 			} else if (ret == 1 && buf[0] == '\n') {
 				UPDATE_TRACE_POINT();
-				printAppOutput(pid, name, "", 0);
+				LoggingKit::logAppOutput(pid, name, "", 0);
 			} else {
 				UPDATE_TRACE_POINT();
 				vector<StaticString> lines;
@@ -107,7 +107,7 @@ private:
 				}
 				split(StaticString(buf, ret2), '\n', lines);
 				foreach (const StaticString line, lines) {
-					printAppOutput(pid, name, line.data(), line.size());
+					LoggingKit::logAppOutput(pid, name, line.data(), line.size());
 				}
 			}