Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix configuration file reader in the presence of @include. (#2725) 

Vector options in configuration files including others which set
them as well had been ignored. This patch fixes this behaviour.
This commit is contained in:
Max Neunhöffer 2017-07-04 22:37:46 +02:00 committed by Frank Celler
parent 5ea18952b0
commit 3387d794a7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ApplicationFeatures/ConfigFeature.cpp
View File

@ -115,7 +115,7 @@ void ConfigFeature::loadConfigFile(std::shared_ptr<ProgramOptions> options,
if (FileUtils::exists(local)) {
LOG_TOPIC(DEBUG, Logger::CONFIG) << "loading override '" << local << "'";
if (!parser.parse(local)) {
if (!parser.parse(local, true)) {
FATAL_ERROR_EXIT();
}
}
@ -123,7 +123,7 @@ void ConfigFeature::loadConfigFile(std::shared_ptr<ProgramOptions> options,
LOG_TOPIC(DEBUG, Logger::CONFIG) << "using user supplied config file '"
<< _file << "'";
if (!parser.parse(_file)) {
if (!parser.parse(_file, true)) {
FATAL_ERROR_EXIT();
}
@ -192,7 +192,7 @@ void ConfigFeature::loadConfigFile(std::shared_ptr<ProgramOptions> options,
if (FileUtils::exists(local)) {
LOG_TOPIC(DEBUG, Logger::CONFIG) << "loading override '" << local << "'";
if (!parser.parse(local)) {
if (!parser.parse(local, true)) {
FATAL_ERROR_EXIT();
}
} else {
@ -219,7 +219,7 @@ void ConfigFeature::loadConfigFile(std::shared_ptr<ProgramOptions> options,
}
}
if (!parser.parse(filename)) {
if (!parser.parse(filename, true)) {
exit(EXIT_FAILURE);
}
}

8
lib/ProgramOptions/IniFileParser.h
View File

@ -62,7 +62,7 @@ class IniFileParser {
// parse a config file. returns true if all is well, false otherwise
// errors that occur during parse are reported to _options
bool parse(std::string const& filename) {
bool parse(std::string const& filename, bool endPassAfterwards) {
if (filename.empty()) {
return _options->fail(
"unable to open configuration file: no configuration file specified");
@ -134,7 +134,7 @@ class IniFileParser {
LOG_TOPIC(DEBUG, Logger::CONFIG) << "reading include file '" << include
<< "'";
parse(include);
parse(include, false);
} else if (std::regex_match(line, match, _matchers.assignment)) {
// found assignment
std::string option;
@ -170,7 +170,9 @@ class IniFileParser {
isCommunity ^= isEnterprise;
// all is well
_options->endPass();
if (endPassAfterwards) {
_options->endPass();
}
return true;
}