passenger 5.1.12 → 5.2.0

data/src/cxx_supportlib/ConfigKit/DummyTranslator.h

@@ -27,7 +27,7 @@
 #define _PASSENGER_CONFIG_KIT_DUMMY_TRANSLATOR_H_
 
 #include <vector>
-#include <ConfigKit/Common.h>
+#include <ConfigKit/Translator.h>
 #include <StaticString.h>
 
 namespace Passenger {
@@ -42,29 +42,29 @@ using namespace std;
  * You can learn more about translators in the ConfigKit README, section
  * "The special problem of overlapping configuration names and translation".
  */
-class DummyTranslator {
+class DummyTranslator: public Translator {
 public:
-	Json::Value translate(const Json::Value &doc) const {
+	virtual Json::Value translate(const Json::Value &doc) const {
 		return doc;
 	}
 
-	Json::Value reverseTranslate(const Json::Value &doc) const {
+	virtual Json::Value reverseTranslate(const Json::Value &doc) const {
 		return doc;
 	}
 
-	vector<Error> translate(const vector<Error> &errors) const {
+	virtual vector<Error> translate(const vector<Error> &errors) const {
 		return errors;
 	}
 
-	vector<Error> reverseTranslate(const vector<Error> &errors) const {
+	virtual vector<Error> reverseTranslate(const vector<Error> &errors) const {
 		return errors;
 	}
 
-	StaticString translateOne(const StaticString &key) const {
+	virtual string translateOne(const StaticString &key) const {
 		return key;
 	}
 
-	StaticString reverseTranslateOne(const StaticString &key) const {
+	virtual string reverseTranslateOne(const StaticString &key) const {
 		return key;
 	}
 };

data/src/cxx_supportlib/ConfigKit/IN_PRACTICE.md

@@ -229,18 +229,10 @@ public:
     // You might wonder, how about instead of taking a Schema as a parameter,
     // we define the Schema as a global variable? Well, that would interfere
     // with subclassing; see the HappyDnsQuerier example.
-    SecurityChecker(const Schema &schema, const Json::Value &initialConfig)
-        : config(schema, initialConfig)
-        { }
-
-    // A component should also provide a constructor accepts a translator
-    // object. The translator is then simply passed to the ConfigKit::Store
-    // constructor.
     //
-    // This variant of the component constructor is necessary to allow parent
+    // This constructor accepts a translator: it is necessary to allow parent
     // components to compose child components. You will see the usage
     // of this constructor in the Downloader example.
-    template<typename Translator>
     SecurityChecker(const Schema &schema, const Json::Value &initialConfig,
         const Translator &translator)
         : config(schema, initialConfig, translator)
@@ -447,16 +439,8 @@ private:
 public:
     // Same as with SecurityChecker, but also initializes
     // the config realization object.
-    DnsQuerier(const Schema &schema, const Json::Value &initialConfig)
-        : config(schema, initialConfig),
-          configRlz(config)
-        { }
-
-    // Same as with SecurityChecker, but also initializes
-    // the config realization object.
-    template<typename Translator>
     DnsQuerier(const Schema &schema, const Json::Value &initialConfig,
-        const Translator &translator)
+        const Translator &translator = ConfigKit::DummyTranslator())
         : config(schema, initialConfig, translator),
           configRlz(config)
         { }
@@ -591,16 +575,8 @@ private:
 public:
     // Same as with DnsQuerier, but also initializes our own
     // private config realization object.
-    HappyDnsQuerier(const Schema &schema, const Json::Value &initialConfig)
-        : DnsQuerier(schema, initialConfig),
-          configRlz(config)
-        { }
-
-    // Same as with DnsQuerier, but also initializes our own
-    // private config realization object.
-    template<typename Translator>
     HappyDnsQuerier(const Schema &schema, const Json::Value &initialConfig,
-        const Translator &translator)
+        const Translator &translator = ConfigKit::DummyTranslator())
         : DnsQuerier(schema, initialConfig, translator),
           configRlz(config)
         { }
@@ -659,6 +635,7 @@ In this Downloader example, we will demonstrate TableTranslator only.
 
 ~~~c++
  #include <ConfigKit/ConfigKit.h>
+ #include <ConfigKit/TableTranslator.h>
  #include <ConfigKit/SubComponentUtils.h>
 
 class Downloader {
@@ -751,19 +728,8 @@ public:
     // It is because the parent component may define different default
     // values than subcomponents. By passing effective values,
     // such default value overrides are respected.
-    Downloader(const Schema &schema, const Json::Value &initialConfig)
-        : config(schema, initialConfig),
-          securityChecker(schema.securityChecker.schema,
-              config.inspectEffectiveValues(),
-              schema.securityChecker.translator),
-          happyDnsQuerier(schema.happyDnsQuerier.schema,
-              config.inspectEffectiveValues(),
-              schema.happyDnsQuerier.translator)
-        { }
-
-    template<typename Translator>
     Downloader(const Schema &schema, const Json::Value &initialConfig,
-        const Translator &translator)
+        const Translator &translator = ConfigKit::DummyTranslator())
         : config(schema, initialConfig, translator),
           securityChecker(schema.securityChecker.schema,
               config.inspectEffectiveValues(),
@@ -941,9 +907,9 @@ public:
           config(schema, initialConfig)
         { }
 
-    template<typename Translator>
     SecurityChecker(const Schema &schema, const Json::Value &initialConfig,
-        const EventLoopType &_eventLoop, const Translator &translator)
+        const EventLoopType &_eventLoop,
+        const Translator &translator = ConfigKit::DummyTranslator())
         : eventLoop(eventLoop),
           config(schema, initialConfig, translator)
         { }

data/src/cxx_supportlib/ConfigKit/PrefixTranslator.h

@@ -26,14 +26,8 @@
 #ifndef _PASSENGER_CONFIG_KIT_PREFIX_TRANSLATOR_H_
 #define _PASSENGER_CONFIG_KIT_PREFIX_TRANSLATOR_H_
 
-#include <boost/bind.hpp>
+#include <ConfigKit/Translator.h>
 #include <cassert>
-#include <string>
-#include <vector>
-#include <jsoncpp/json.h>
-
-#include <ConfigKit/Common.h>
-#include <StaticString.h>
 
 namespace Passenger {
 namespace ConfigKit {
@@ -47,19 +41,11 @@ using namespace std;
  * You can learn more about translators in the ConfigKit README, section
  * "The special problem of overlapping configuration names and translation".
  */
-class PrefixTranslator {
+class PrefixTranslator: public Translator {
 private:
 	string prefix;
 	bool finalized;
 
-	string translateErrorKey(const StaticString &key) const {
-		return "{{" + translateOne(key) + "}}";
-	}
-
-	string reverseTranslateErrorKey(const StaticString &key) const {
-		return "{{" + reverseTranslateOne(key) + "}}";
-	}
-
 public:
 	PrefixTranslator()
 		: finalized(false)
@@ -80,67 +66,27 @@ public:
 		return finalized;
 	}
 
-	Json::Value translate(const Json::Value &doc) const {
+	virtual Json::Value translate(const Json::Value &doc) const {
 		assert(finalized);
-		Json::Value result(Json::objectValue);
-		Json::Value::const_iterator it, end = doc.end();
-
-		for (it = doc.begin(); it != end; it++) {
-			const char *keyEnd;
-			const char *key = it.memberName(&keyEnd);
-			result[translateOne(StaticString(key, keyEnd - key))] = *it;
-		}
-
-		return result;
+		return Translator::translate(doc);
 	}
 
-	Json::Value reverseTranslate(const Json::Value &doc) const {
+	virtual Json::Value reverseTranslate(const Json::Value &doc) const {
 		assert(finalized);
-		Json::Value result(Json::objectValue);
-		Json::Value::const_iterator it, end = doc.end();
-
-		for (it = doc.begin(); it != end; it++) {
-			const char *keyEnd;
-			const char *key = it.memberName(&keyEnd);
-			result[reverseTranslateOne(StaticString(key, keyEnd - key))] = *it;
-		}
-
-		return result;
+		return Translator::reverseTranslate(doc);
 	}
 
-	vector<Error> translate(const vector<Error> &errors) const {
+	virtual vector<Error> translate(const vector<Error> &errors) const {
 		assert(finalized);
-		vector<Error> result;
-		vector<Error>::const_iterator it, end = errors.end();
-		Error::KeyProcessor keyProcessor =
-			boost::bind(&PrefixTranslator::translateErrorKey, this,
-				boost::placeholders::_1);
-
-		for (it = errors.begin(); it != end; it++) {
-			const Error &error = *it;
-			result.push_back(Error(error.getMessage(keyProcessor)));
-		}
-
-		return result;
+		return Translator::translate(errors);
 	}
 
-	vector<Error> reverseTranslate(const vector<Error> &errors) const {
+	virtual vector<Error> reverseTranslate(const vector<Error> &errors) const {
 		assert(finalized);
-		vector<Error> result;
-		vector<Error>::const_iterator it, end = errors.end();
-		Error::KeyProcessor keyProcessor =
-			boost::bind(&PrefixTranslator::reverseTranslateErrorKey, this,
-				boost::placeholders::_1);
-
-		for (it = errors.begin(); it != end; it++) {
-			const Error &error = *it;
-			result.push_back(Error(error.getMessage(keyProcessor)));
-		}
-
-		return result;
+		return Translator::reverseTranslate(errors);
 	}
 
-	string translateOne(const StaticString &key) const {
+	virtual string translateOne(const StaticString &key) const {
 		assert(finalized);
 		if (key.substr(0, prefix.size()) == prefix) {
 			return key.substr(prefix.size());
@@ -149,7 +95,7 @@ public:
 		}
 	}
 
-	string reverseTranslateOne(const StaticString &key) const {
+	virtual string reverseTranslateOne(const StaticString &key) const {
 		assert(finalized);
 		if (key.substr(0, prefix.size()) != prefix) {
 			return prefix + key;

data/src/cxx_supportlib/ConfigKit/Schema.h

@@ -74,6 +74,47 @@ public:
 			  inspectFilter(_inspectFilter)
 			{ }
 
+		Json::Value typecastValue(const Json::Value &val) const {
+			if (val.isNull()) {
+				return Json::nullValue;
+			}
+
+			switch (type) {
+			case STRING_TYPE:
+				if (val.isString()) {
+					return val;
+				} else {
+					return val.asString();
+				}
+			case INT_TYPE:
+				if (val.isInt()) {
+					return val;
+				} else {
+					return val.asInt();
+				}
+			case UINT_TYPE:
+				if (val.isUInt()) {
+					return val;
+				} else {
+					return val.asUInt();
+				}
+			case FLOAT_TYPE:
+				if (val.isDouble()) {
+					return val;
+				} else {
+					return val.asDouble();
+				}
+			case BOOL_TYPE:
+				if (val.isBool()) {
+					return val;
+				} else {
+					return val.asBool();
+				}
+			default:
+				return val;
+			}
+		}
+
 		Json::Value inspect() const {
 			Json::Value result(Json::objectValue);
 			inspect(result);
@@ -131,18 +172,15 @@ private:
 		return v;
 	}
 
-	template<typename Translator>
 	static Json::Value getValueFromSubSchema(
 		const Store &storeWithMainSchema,
 		const Schema *subschema, const Translator *translator,
 		const HashedStaticString &key);
 
-	template<typename Translator>
 	static void validateSubSchema(const Store &store, vector<Error> &errors,
 		const Schema *subschema, const Translator *translator,
 		const Validator &origValidator);
 
-	template<typename Translator>
 	static Json::Value normalizeSubSchema(const Json::Value &effectiveValues,
 		const Schema *mainSchema, const Schema *subschema,
 		const Translator *translator, const Normalizer &origNormalizer);
@@ -194,11 +232,6 @@ public:
 		return EntryBuilder(entries.insert(key, entry)->value);
 	}
 
-	void addSubSchema(const Schema &subschema) {
-		addSubSchema(subschema, DummyTranslator());
-	}
-
-	template<typename Translator>
 	void addSubSchema(const Schema &subschema, const Translator &translator) {
 		assert(!finalized);
 		assert(subschema.finalized);
@@ -212,7 +245,7 @@ public:
 			if (entry.defaultValueGetter) {
 				if (entry.flags & _DYNAMIC_DEFAULT_VALUE) {
 					valueGetter = boost::bind<Json::Value>(
-						getValueFromSubSchema<Translator>,
+						getValueFromSubSchema,
 						boost::placeholders::_1, &subschema, &translator,
 						key);
 				} else {
@@ -229,7 +262,7 @@ public:
 		boost::container::vector<Validator>::const_iterator v_it, v_end
 			= subschema.getValidators().end();
 		for (v_it = subschema.getValidators().begin(); v_it != v_end; v_it++) {
-			validators.push_back(boost::bind(validateSubSchema<Translator>,
+			validators.push_back(boost::bind(validateSubSchema,
 				boost::placeholders::_1, boost::placeholders::_2,
 				&subschema, &translator, *v_it));
 		}
@@ -237,11 +270,29 @@ public:
 		boost::container::vector<Normalizer>::const_iterator n_it, n_end
 			= subschema.getNormalizers().end();
 		for (n_it = subschema.getNormalizers().begin(); n_it != n_end; n_it++) {
-			normalizers.push_back(boost::bind(normalizeSubSchema<Translator>,
+			normalizers.push_back(boost::bind(normalizeSubSchema,
 				boost::placeholders::_1, this, &subschema, &translator, *n_it));
 		}
 	}
 
+	bool erase(const HashedStaticString &key) {
+		return entries.erase(key);
+	}
+
+	void override(const HashedStaticString &key, Type type, unsigned int flags,
+		const Json::Value &defaultValue = Json::Value(Json::nullValue))
+	{
+		erase(key);
+		add(key, type, flags, defaultValue);
+	}
+
+	void overrideWithDynamicDefault(const HashedStaticString &key, Type type, unsigned int flags,
+		const ValueGetter &defaultValueGetter)
+	{
+		erase(key);
+		addWithDynamicDefault(key, type, flags, defaultValueGetter);
+	}
+
 	void addValidator(const Validator &validator) {
 		assert(!finalized);
 		validators.push_back(validator);

data/src/cxx_supportlib/ConfigKit/{ValidationUtils.h → SchemaUtils.h}

@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_CONFIG_KIT_VALIDATION_UTILS_H_
-#define _PASSENGER_CONFIG_KIT_VALIDATION_UTILS_H_
+#ifndef _PASSENGER_CONFIG_KIT_SCHEMA_UTILS_H_
+#define _PASSENGER_CONFIG_KIT_SCHEMA_UTILS_H_
 
 #include <ConfigKit/Store.h>
 #include <string>
@@ -36,6 +36,15 @@ namespace ConfigKit {
 using namespace std;
 
 
+inline Json::Value
+getDefaultStandaloneEngine(const Store &store) {
+	if (store["integration_mode"].asString() == "standalone") {
+		return "builtin";
+	} else {
+		return Json::nullValue;
+	}
+}
+
 inline void
 validateIntegrationMode(const Store &config, vector<Error> &errors) {
 	if (config["integration_mode"].isNull()) {
@@ -66,4 +75,4 @@ validateStandaloneEngine(const Store &config, vector<Error> &errors) {
 } // namespace ConfigKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_CONFIG_KIT_VALIDATION_UTILS_H_ */
+#endif /* _PASSENGER_CONFIG_KIT_SCHEMA_UTILS_H_ */

data/src/cxx_supportlib/ConfigKit/Store.h

@@ -42,6 +42,7 @@
 #include <ConfigKit/Common.h>
 #include <ConfigKit/Schema.h>
 #include <ConfigKit/Utils.h>
+#include <ConfigKit/Translator.h>
 #include <LoggingKit/Assert.h>
 #include <Exceptions.h>
 #include <DataStructures/StringKeyTable.h>
@@ -287,7 +288,6 @@ public:
 		}
 	}
 
-	template<typename Translator>
 	Store(const Schema &_schema, const Json::Value &initialValues,
 		const Translator &translator)
 		: schema(&_schema),
@@ -306,10 +306,21 @@ public:
 		: schema(other.schema),
 		  updatedOnce(false)
 	{
-		initialize();
-		if (update(other.inspectUserValues(), errors)) {
-			update(updates, errors);
+		Json::Value result(Json::objectValue);
+		StringKeyTable<Entry>::ConstIterator it(other.entries);
+
+		while (*it != NULL) {
+			const Entry &entry = it.getValue();
+			if (updates.isMember(it.getKey())) {
+				result[it.getKey()] = updates[it.getKey()];
+			} else if (!entry.userValue.isNull()) {
+				result[it.getKey()] = entry.userValue;
+			}
+			it.next();
 		}
+
+		initialize();
+		update(result, errors);
 	}
 
 	const Schema &getSchema() const {
@@ -458,7 +469,8 @@ public:
 				if (isWritable(entry)) {
 					const Json::Value &subdoc =
 						const_cast<const Json::Value &>(preview)[it.getKey()];
-					entry.userValue = subdoc["user_value"];
+					entry.userValue = entry.schemaEntry->typecastValue(
+						subdoc["user_value"]);
 				}
 				it.next();
 			}
@@ -469,7 +481,6 @@ public:
 		}
 	}
 
-	template<typename Translator>
 	Store extractDataForSubSchema(const Schema &subSchema,
 		const Translator &translator) const
 	{
@@ -570,7 +581,6 @@ public:
 };
 
 
-template<typename Translator>
 inline Json::Value
 Schema::getValueFromSubSchema(
 	const Store &store,
@@ -590,7 +600,6 @@ Schema::getValueFromSubSchema(
 	}
 }
 
-template<typename Translator>
 inline void
 Schema::validateSubSchema(const Store &store, vector<Error> &errors,
 	const Schema *subschema, const Translator *translator,
@@ -605,7 +614,6 @@ Schema::validateSubSchema(const Store &store, vector<Error> &errors,
 	}
 }
 
-template<typename Translator>
 inline Json::Value
 Schema::normalizeSubSchema(const Json::Value &effectiveValues,
 	const Schema *mainSchema, const Schema *subschema,