summaryrefslogtreecommitdiff
path: root/src/mongo/util/options_parser/option_section.h
diff options
context:
space:
mode:
authorGregory Noma <gregory.noma@gmail.com>2018-06-07 16:30:07 -0400
committerGregory Noma <gregory.noma@gmail.com>2018-07-05 10:07:46 -0400
commit96628864b50e4d0377dd920eef647e46c5bc5db8 (patch)
tree36eb7c7133a1464e28d57bad7cc0e0fce4971ec5 /src/mongo/util/options_parser/option_section.h
parent711c076ef57c0ce3517ab9385c2fd3a005c941b3 (diff)
downloadmongo-96628864b50e4d0377dd920eef647e46c5bc5db8.tar.gz
SERVER-29917 Alias server options starting with 'ssl' to parameters starting with 'tls'
Add support for deprecated single names. All 'ssl' options are now deprecated, superceded by their 'tls' counterparts. Add tests for these options in server_options_test. Re-add functionality of disableNonSSLConnectionLogging.
Diffstat (limited to 'src/mongo/util/options_parser/option_section.h')
-rw-r--r--src/mongo/util/options_parser/option_section.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/mongo/util/options_parser/option_section.h b/src/mongo/util/options_parser/option_section.h
index cea28d523d1..435711a1dea 100644
--- a/src/mongo/util/options_parser/option_section.h
+++ b/src/mongo/util/options_parser/option_section.h
@@ -110,22 +110,13 @@ public:
* as another option. These represent programming errors that should not happen during
* normal operation.
*/
- OptionDescription& addOptionChaining(const std::string& dottedName,
- const std::string& singleName,
- const OptionType type,
- const std::string& description);
-
- OptionDescription& addOptionChaining(const std::string& dottedName,
- const std::string& singleName,
- const OptionType type,
- const std::string& description,
- const std::string& deprecatedDottedName);
-
- OptionDescription& addOptionChaining(const std::string& dottedName,
- const std::string& singleName,
- const OptionType type,
- const std::string& description,
- const std::vector<std::string>& deprecatedDottedNames);
+ OptionDescription& addOptionChaining(
+ const std::string& dottedName,
+ const std::string& singleName,
+ const OptionType type,
+ const std::string& description,
+ const std::vector<std::string>& deprecatedDottedNames = {},
+ const std::vector<std::string>& deprecatedSingleNames = {});
// These functions are used by the OptionsParser to make calls into boost::program_options
Status getBoostOptions(po::options_description* boostOptions,