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

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
jsteemann 2016-03-16 09:59:05 +01:00
parent 85c5333dcf abc7d6b84b
commit 228b5567fc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ApplicationFeatures/ConsoleFeature.cpp
View File

@ -86,12 +86,15 @@ ConsoleFeature::ConsoleFeature(application_features::ApplicationServer* server)
void ConsoleFeature::collectOptions(std::shared_ptr<ProgramOptions> options) { void ConsoleFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
LOG_TOPIC(TRACE, Logger::STARTUP) << name() << "::collectOptions"; LOG_TOPIC(TRACE, Logger::STARTUP) << name() << "::collectOptions";
options->addSection(Section("console", "Configure the console", options->addSection(
"console options", false, false)); Section("", "Global configuration", "global options", false, false));
options->addOption("--quiet", "silent startup", options->addOption("--quiet", "silent startup",
new BooleanParameter(&_quiet, false)); new BooleanParameter(&_quiet, false));
options->addSection(Section("console", "Configure the console",
"console options", false, false));
options->addOption("--console.colors", "enable color support", options->addOption("--console.colors", "enable color support",
new BooleanParameter(&_colors)); new BooleanParameter(&_colors));

3
lib/ApplicationFeatures/LanguageFeature.cpp
View File

@ -43,6 +43,9 @@ void LanguageFeature::collectOptions(
std::shared_ptr<options::ProgramOptions> options) { std::shared_ptr<options::ProgramOptions> options) {
LOG_TOPIC(TRACE, Logger::STARTUP) << name() << "::collectOptions"; LOG_TOPIC(TRACE, Logger::STARTUP) << name() << "::collectOptions";
options->addSection(
Section("", "Global configuration", "global options", false, false));
options->addHiddenOption("--default-language", "ISO-639 language code", options->addHiddenOption("--default-language", "ISO-639 language code",
new StringParameter(&_language)); new StringParameter(&_language));
} }