passenger 5.1.7 → 5.1.8

data/build/support/general.rb

@@ -22,32 +22,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-class TemplateRenderer
-  def initialize(filename)
-    require 'erb' if !defined?(ERB)
-    @erb = ERB.new(File.read(filename), nil, "-")
-    @erb.filename = filename
-  end
-
-  def render
-    return @erb.result(binding)
-  end
-
-  def render_to(filename)
-    puts "Creating #{filename}"
-    text = render
-    # When packaging, some timestamps may be modified. The user may not
-    # have write access to the source root (for example, when Passenger
-    # Standalone is compiling its runtime), so we only write to the file
-    # when necessary.
-    if !File.exist?(filename) || File.writable?(filename) || File.read(filename) != text
-      File.open(filename, 'w') do |f|
-        f.write(text)
-      end
-    end
-  end
-end
-
 class CxxCodeTemplateRenderer
   def initialize(filename)
     if !defined?(CxxCodeBuilder)

data/resources/templates/standalone/rails_asset_pipeline.erb

@@ -1,5 +1,5 @@
-# Rails asset pipeline support.
-location ~ "^/assets/.+-([0-9a-f]{32}|[0-9a-f]{64})\..+" {
+# Rails asset pipeline & webpacker support.
+location ~ "^/(assets|packs)/.+-([0-9a-f]{32}|[0-9a-f]{64}|[0-9a-f]{20})\..+" {
     error_page 490 = @static_asset;
     error_page 491 = @dynamic_request;
     recursive_error_pages on;

data/src/agent/Core/ApiServer.h

@@ -28,9 +28,9 @@
 
 #include <boost/regex.hpp>
 #include <oxt/thread.hpp>
-#include <sstream>
 #include <string>
 #include <cstring>
+#include <exception>
 #include <sys/types.h>
 
 #include <jsoncpp/json.h>
@@ -43,7 +43,8 @@
 #include <DataStructures/LString.h>
 #include <Exceptions.h>
 #include <StaticString.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
+#include <LoggingKit/Context.h>
 #include <Constants.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/BufferedIO.h>
@@ -413,7 +414,7 @@ private:
 		count = mbuf_pool_compact(&ctx->mbuf_pool);
 		SKS_NOTICE_FROM_STATIC(controller, "Freed " << count << " mbufs");
 
-		controller->compact(LVL_NOTICE);
+		controller->compact(LoggingKit::NOTICE);
 	}
 
 	void processGc(Client *client, Request *req) {
@@ -475,16 +476,18 @@ private:
 		}
 
 		HeaderTable headers;
-		string logFile = getLogFile();
-		string fileDescriptorLogFile = getFileDescriptorLogFile();
+		ConfigKit::Store loggingConfig = LoggingKit::context->getConfig();
 
 		headers.insert(req->pool, "Content-Type", "application/json");
-		config["log_level"] = getLogLevel();
-		if (!logFile.empty()) {
-			config["log_file"] = logFile;
+		config["log_level"] = (int) LoggingKit::parseLevel(loggingConfig["level"].asString());
+		if (loggingConfig["target"].isMember("path")) {
+			config["log_file"] = loggingConfig["target"]["path"].asString();
 		}
-		if (!fileDescriptorLogFile.empty()) {
-			config["file_descriptor_log_file"] = fileDescriptorLogFile;
+		if (!loggingConfig["file_descriptor_log_target"].isNull()
+			&& loggingConfig["file_descriptor_log_target"].isMember("path"))
+		{
+			config["file_descriptor_log_file"] =
+				loggingConfig["file_descriptor_log_target"]["path"].asString();
 		}
 
 		writeSimpleResponse(client, 200, &headers,
@@ -499,7 +502,11 @@ private:
 
 	static void configureController(Controller *controller, Json::Value updates) {
 		vector<ConfigKit::Error> errors;
-		if (!controller->configure(updates, errors)) {
+		ControllerConfigChangeRequest req;
+
+		if (controller->prepareConfigChange(updates, errors, req)) {
+			controller->commitConfigChange(req);
+		} else {
 			P_ERROR("Unable to apply configuration change to Core controller.\n"
 				"Configuration: " << updates.toStyledString() << "\n"
 				"Errors: " << toString(errors));
@@ -508,46 +515,44 @@ private:
 
 	void processConfigBody(Client *client, Request *req) {
 		HeaderTable headers;
-		Json::Value &json = req->jsonBody;
+		LoggingKit::ConfigChangeRequest configReq;
+		const Json::Value &json = req->jsonBody;
+		vector<ConfigKit::Error> errors;
+		bool ok;
 
 		headers.insert(req->pool, "Content-Type", "application/json");
 		headers.insert(req->pool, "Cache-Control", "no-cache, no-store, must-revalidate");
 
-		if (json.isMember("log_level")) {
-			setLogLevel(json["log_level"].asInt());
-		}
-		if (json.isMember("log_file")) {
-			string logFile = json["log_file"].asString();
-			try {
-				logFile = absolutizePath(logFile);
-			} catch (const SystemException &e) {
-				unsigned int bufsize = 1024;
-				char *message = (char *) psg_pnalloc(req->pool, bufsize);
-				snprintf(message, bufsize, "{ \"status\": \"error\", "
-					"\"message\": \"Cannot absolutize log file filename: %s\" }",
-					e.what());
-				writeSimpleResponse(client, 500, &headers, message);
-				if (!req->ended()) {
-					endRequest(&client, &req);
-				}
-				return;
+		try {
+			ok = LoggingKit::context->prepareConfigChange(json,
+				errors, configReq);
+		} catch (const std::exception &e) {
+			unsigned int bufsize = 2048;
+			char *message = (char *) psg_pnalloc(req->pool, bufsize);
+			snprintf(message, bufsize, "{ \"status\": \"error\", "
+				"\"message\": \"Error reconfiguring logging system: %s\" }",
+				e.what());
+			writeSimpleResponse(client, 500, &headers, message);
+			if (!req->ended()) {
+				endRequest(&client, &req);
 			}
-
-			int e;
-			if (!setLogFile(logFile, &e)) {
-				unsigned int bufsize = 1024;
-				char *message = (char *) psg_pnalloc(req->pool, bufsize);
-				snprintf(message, bufsize, "{ \"status\": \"error\", "
-					"\"message\": \"Cannot open log file: %s (errno=%d)\" }",
-					strerror(e), e);
-				writeSimpleResponse(client, 500, &headers, message);
-				if (!req->ended()) {
-					endRequest(&client, &req);
-				}
-				return;
+			return;
+		}
+		if (!ok) {
+			unsigned int bufsize = 2048;
+			char *message = (char *) psg_pnalloc(req->pool, bufsize);
+			snprintf(message, bufsize, "{ \"status\": \"error\", "
+				"\"message\": \"Error reconfiguring logging system: %s\" }",
+				ConfigKit::toString(errors).c_str());
+			writeSimpleResponse(client, 500, &headers, message);
+			if (!req->ended()) {
+				endRequest(&client, &req);
 			}
-			P_NOTICE("Log file opened.");
+			return;
 		}
+
+		LoggingKit::context->commitConfigChange(configReq);
+
 		for (unsigned int i = 0; i < controllers.size(); i++) {
 			controllers[i]->getContext()->libev->runLater(boost::bind(
 				configureController, controllers[i], json));

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

@@ -48,7 +48,7 @@
 #include <oxt/backtrace.hpp>
 #include <sys/types.h>
 #include <MemoryKit/palloc.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Exceptions.h>
 #include <Hooks.h>
 #include <Utils/Lock.h>

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

@@ -42,7 +42,7 @@
 #include <cstring>
 #include <Constants.h>
 #include <FileDescriptor.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Utils/SystemTime.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/Lock.h>

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

@@ -34,7 +34,7 @@
 #include <climits>
 #include <cassert>
 #include <SmallVector.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
 #include <MemoryKit/palloc.h>
 #include <Utils/IOUtils.h>

data/src/agent/Core/Controller.h

@@ -32,7 +32,7 @@
 
 #define CC_BENCHMARK_POINT(client, req, value) \
 	do { \
-		if (OXT_UNLIKELY(mainConfigCache.benchmarkMode == value)) { \
+		if (OXT_UNLIKELY(mainConfig.benchmarkMode == value)) { \
 			writeBenchmarkResponse(&client, &req); \
 			return; \
 		} \
@@ -61,7 +61,7 @@
 #include <cassert>
 #include <cctype>
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <MessageReadersWriters.h>
 #include <Constants.h>
 #include <ConfigKit/ConfigKit.h>
@@ -109,13 +109,14 @@ private:
 	typedef ServerKit::FdSourceChannel FdSourceChannel;
 	typedef ServerKit::FileBufferedChannel FileBufferedChannel;
 	typedef ServerKit::FileBufferedFdSinkChannel FileBufferedFdSinkChannel;
+	typedef ControllerConfigChangeRequest ConfigChangeRequest;
 
 	// If you change this value, make sure that Request::sessionCheckoutTry
 	// has enough bits.
 	static const unsigned int MAX_SESSION_CHECKOUT_TRY = 10;
 
-	ControllerMainConfigCache mainConfigCache;
-	ControllerRequestConfigCachePtr requestConfigCache;
+	ControllerMainConfig mainConfig;
+	ControllerRequestConfigPtr requestConfig;
 	StringKeyTable< boost::shared_ptr<Options> > poolOptionsCache;
 
 	HashedStaticString PASSENGER_APP_GROUP_NAME;
@@ -158,8 +159,8 @@ private:
 	void initializeFlags(Client *client, Request *req, RequestAnalysis &analysis);
 	bool respondFromTurboCache(Client *client, Request *req);
 	void initializePoolOptions(Client *client, Request *req, RequestAnalysis &analysis);
-	void fillPoolOptionsFromConfigCaches(Options &options,
-		const ControllerRequestConfigCachePtr &requestConfigCache);
+	void fillPoolOptionsFromConfigCaches(Options &options, psg_pool_t *pool,
+		const ControllerRequestConfigPtr &requestConfigCache);
 	static void fillPoolOption(Request *req, StaticString &field,
 		const HashedStaticString &name);
 	static void fillPoolOption(Request *req, int &field,
@@ -350,7 +351,6 @@ protected:
 	virtual void onNextRequestEarlyReadError(Client *client, Request *req, int errcode);
 	virtual bool shouldDisconnectClientOnShutdown(Client *client);
 	virtual bool supportsUpgrade(Client *client, Request *req);
-	virtual void onConfigChange(const ConfigKit::Store *oldConfig);
 
 
 	/****** Marked virtual so that unit tests can mock these ******/
@@ -380,7 +380,15 @@ public:
 	virtual StaticString getServerName() const;
 
 
-	/****** State inspection and configuration ******/
+	/****** Configuration handling ******/
+
+	bool prepareConfigChange(const Json::Value &updates,
+		vector<ConfigKit::Error> &errors, ControllerConfigChangeRequest &req);
+	void commitConfigChange(ControllerConfigChangeRequest &req)
+		BOOST_NOEXCEPT_OR_NOTHROW;
+
+
+	/****** State and configuration ******/
 
 	unsigned int getThreadNumber() const; // Thread-safe
 	virtual Json::Value inspectStateAsJson() const;

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

@@ -377,7 +377,7 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r, const StaticStr
 bool
 Controller::friendlyErrorPagesEnabled(Request *req) {
 	bool defaultValue;
-	const StaticString &defaultStr = req->configCache->friendlyErrorPages;
+	const StaticString &defaultStr = req->config->friendlyErrorPages;
 	if (defaultStr == "auto") {
 		defaultValue = (req->options.environment == "development");
 	} else {

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

@@ -0,0 +1,68 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 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 <Core/Controller.h>
+
+namespace Passenger {
+namespace Core {
+
+using namespace std;
+
+
+/****************************
+ *
+ * Private methods
+ *
+ ****************************/
+
+
+bool
+Controller::prepareConfigChange(const Json::Value &updates,
+	vector<ConfigKit::Error> &errors,
+	ControllerConfigChangeRequest &req)
+{
+	if (ParentClass::prepareConfigChange(updates, errors, req.forParent)) {
+		req.mainConfig.reset(new ControllerMainConfig(
+			*req.forParent.forParent.config));
+		req.requestConfig.reset(new ControllerRequestConfig(
+			*req.forParent.forParent.config));
+	}
+	return errors.empty();
+}
+
+void
+Controller::commitConfigChange(ControllerConfigChangeRequest &req)
+	BOOST_NOEXCEPT_OR_NOTHROW
+{
+	ParentClass::commitConfigChange(req.forParent);
+	mainConfig.swap(*req.mainConfig);
+	requestConfig.swap(req.requestConfig);
+	getContext()->defaultFileBufferedChannelConfig.bufferDir =
+		config["data_buffer_dir"].asString();
+}
+
+
+} // namespace Core
+} // namespace Passenger

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

@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <ConfigKit/ConfigKit.h>
+#include <ConfigKit/ValidationUtils.h>
 #include <MemoryKit/palloc.h>
 #include <ServerKit/HttpServer.h>
 #include <Constants.h>
@@ -113,6 +114,7 @@ private:
 		add("force_max_concurrent_requests_per_process", INT_TYPE, OPTIONAL, -1);
 		add("abort_websockets_on_process_shutdown", BOOL_TYPE, OPTIONAL, true);
 		add("load_shell_envvars", BOOL_TYPE, OPTIONAL, false);
+		add("max_requests", UINT_TYPE, OPTIONAL, 0);
 
 		// Single app mode options
 		add("app_root", STRING_TYPE, OPTIONAL);
@@ -128,6 +130,7 @@ private:
 		addValidator(validate);
 		addValidator(validateMultiAppMode);
 		addValidator(validateSingleAppMode);
+		addValidator(ConfigKit::validateIntegrationMode);
 	}
 
 	static Json::Value inferDefaultValueForDefaultGroup(const ConfigKit::Store &config) {
@@ -177,15 +180,15 @@ private:
 		}
 
 		if (config["app_root"].isNull()) {
-			errors.push_back(Error("If '{{multi_app}}' is set"
+			errors.push_back(Error("If '{{multi_app}}' is not set"
 				" then '{{app_root}}' is required"));
 		}
 		if (config["app_type"].isNull()) {
-			errors.push_back(Error("If '{{multi_app}}' is set"
+			errors.push_back(Error("If '{{multi_app}}' is not set"
 				" then '{{app_type}}' is required"));
 		}
 		if (config["startup_file"].isNull()) {
-			errors.push_back(Error("If '{{multi_app}}' is set"
+			errors.push_back(Error("If '{{multi_app}}' is not set"
 				" then '{{startup_file}}' is required"));
 		}
 
@@ -228,7 +231,17 @@ public:
 	}
 };
 
-class ControllerMainConfigCache {
+/**
+ * A structure that caches controller configuration which is allowed to
+ * change at any time, even during the middle of a request.
+ */
+class ControllerMainConfig {
+private:
+	StaticString createServerLogName() {
+		string name = "ServerThr." + toString(threadNumber);
+		return psg_pstrdup(pool, name);
+	}
+
 public:
 	psg_pool_t *pool;
 
@@ -245,49 +258,63 @@ public:
 	/*******************/
 	/*******************/
 
-	ControllerMainConfigCache(const ConfigKit::Store &initialConfig)
+	ControllerMainConfig(const ConfigKit::Store &config)
 		: pool(psg_create_pool(1024)),
 
-		  threadNumber(0),
-		  statThrottleRate(0),
-		  responseBufferHighWatermark(0),
-		  benchmarkMode(BM_UNKNOWN),
-		  userSwitching(false),
-		  stickySessions(false),
-		  gracefulExit(0)
+		  threadNumber(config["thread_number"].asUInt()),
+		  statThrottleRate(config["stat_throttle_rate"].asUInt()),
+		  responseBufferHighWatermark(config["response_buffer_high_watermark"].asUInt()),
+		  integrationMode(psg_pstrdup(pool, config["integration_mode"].asString())),
+		  serverLogName(createServerLogName()),
+		  benchmarkMode(parseControllerBenchmarkMode(config["benchmark_mode"].asString())),
+		  userSwitching(config["user_switching"].asBool()),
+		  stickySessions(config["sticky_sessions"].asBool()),
+		  gracefulExit(config["core_graceful_exit"].asBool())
 
 		  /*******************/
 	{
-		update(initialConfig);
-
-		integrationMode = psg_pstrdup(pool, initialConfig["integration_mode"].asString());
-
-		string name = "ServerThr." + toString(threadNumber);
-		serverLogName = psg_pstrdup(pool, name);
-
 		/*******************/
 	}
 
-	~ControllerMainConfigCache() {
+	~ControllerMainConfig() {
 		psg_destroy_pool(pool);
 	}
 
-	void update(const ConfigKit::Store &config) {
-		threadNumber = config["thread_number"].asUInt();
-
-		userSwitching = config["user_switching"].asBool();
-		statThrottleRate = config["stat_throttle_rate"].asUInt();
-		responseBufferHighWatermark = config["response_buffer_high_watermark"].asUInt();
-		stickySessions = config["sticky_sessions"].asBool();
-		gracefulExit = config["core_graceful_exit"].asBool();
-		benchmarkMode = parseControllerBenchmarkMode(config["benchmark_mode"].asString());
+	void swap(ControllerMainConfig &other) BOOST_NOEXCEPT_OR_NOTHROW {
+		#define SWAP_BITFIELD(Type, name) \
+			do { \
+				Type tmp = name; \
+				name = other.name; \
+				other.name = tmp; \
+			} while (false)
+
+		std::swap(pool, other.pool);
+		std::swap(threadNumber, other.threadNumber);
+		std::swap(statThrottleRate, other.statThrottleRate);
+		std::swap(responseBufferHighWatermark, other.responseBufferHighWatermark);
+		std::swap(integrationMode, other.integrationMode);
+		std::swap(serverLogName, other.serverLogName);
+		SWAP_BITFIELD(ControllerBenchmarkMode, benchmarkMode);
+		SWAP_BITFIELD(bool, userSwitching);
+		SWAP_BITFIELD(bool, stickySessions);
+		SWAP_BITFIELD(bool, gracefulExit);
 
 		/*******************/
+
+		#undef SWAP_BITFIELD
 	}
 };
 
-class ControllerRequestConfigCache:
-	public boost::intrusive_ref_counter<ControllerRequestConfigCache,
+/**
+ * A structure that caches controller configuration that must stay the
+ * same for the entire duration of a request.
+ *
+ * Note that this structure has got nothing to do with per-request config
+ * options: options which may be configured by the web server on a
+ * per-request basis. That is an orthogonal concept.
+ */
+class ControllerRequestConfig:
+	public boost::intrusive_ref_counter<ControllerRequestConfig,
 		boost::thread_unsafe_counter>
 {
 public:
@@ -313,6 +340,7 @@ public:
 	unsigned int minInstances;
 	unsigned int maxPreloaderIdleTime;
 	unsigned int maxRequestQueueSize;
+	unsigned int maxRequests;
 	int forceMaxConcurrentRequestsPerProcess;
 	bool singleAppMode: 1;
 	bool showVersionInHeader: 1;
@@ -323,7 +351,7 @@ public:
 	/*******************/
 
 
-	ControllerRequestConfigCache(const ConfigKit::Store &config)
+	ControllerRequestConfig(const ConfigKit::Store &config)
 		: pool(psg_create_pool(1024 * 4)),
 
 		  defaultRuby(psg_pstrdup(pool, config["default_ruby"].asString())),
@@ -346,6 +374,7 @@ public:
 		  minInstances(config["min_instances"].asUInt()),
 		  maxPreloaderIdleTime(config["max_preloader_idle_time"].asUInt()),
 		  maxRequestQueueSize(config["max_request_queue_size"].asUInt()),
+		  maxRequests(config["max_requests"].asUInt()),
 		  forceMaxConcurrentRequestsPerProcess(config["force_max_concurrent_requests_per_process"].asInt()),
 		  singleAppMode(!config["multi_app"].asBool()),
 		  showVersionInHeader(config["show_version_in_header"].asBool()),
@@ -355,12 +384,19 @@ public:
 		  /*******************/
 		{ }
 
-	~ControllerRequestConfigCache() {
+	~ControllerRequestConfig() {
 		psg_destroy_pool(pool);
 	}
 };
 
-typedef boost::intrusive_ptr<ControllerRequestConfigCache> ControllerRequestConfigCachePtr;
+typedef boost::intrusive_ptr<ControllerRequestConfig> ControllerRequestConfigPtr;
+
+
+struct ControllerConfigChangeRequest {
+	ServerKit::HttpServerConfigChangeRequest forParent;
+	boost::scoped_ptr<ControllerMainConfig> mainConfig;
+	ControllerRequestConfigPtr requestConfig;
+};
 
 
 } // namespace Core