diff options
| author | Dan Pasette <dan@10gen.com> | 2013-12-22 22:57:52 -0500 |
|---|---|---|
| committer | Dan Pasette <dan@mongodb.com> | 2013-12-23 11:19:29 -0500 |
| commit | 88a82062a05b2a969219581d066afc3b9580c4bc (patch) | |
| tree | 4fb4223a987389fb4c7685d247680a1a28400197 /src/mongo/db | |
| parent | 5bc0c87690e5f27bd7b2c7e53959c6cc3b98e39c (diff) | |
| download | mongo-88a82062a05b2a969219581d066afc3b9580c4bc.tar.gz | |
SERVER-12149 Deprecate --diaglog server option and hide option
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/mongod_options.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/db/mongod_options_test.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp index d793425f3f6..3881d383bfb 100644 --- a/src/mongo/db/mongod_options.cpp +++ b/src/mongo/db/mongod_options.cpp @@ -100,7 +100,7 @@ namespace mongo { #endif general_options.addOptionChaining("diaglog", "diaglog", moe::Int, - "0=off 1=W 2=R 3=both 7=W+some reads"); + "DEPRECATED: 0=off 1=W 2=R 3=both 7=W+some reads").hidden(); general_options.addOptionChaining("directoryperdb", "directoryperdb", moe::Switch, "each database will be stored in a separate directory"); @@ -464,6 +464,7 @@ namespace mongo { storageGlobalParams.smallfiles = true; } if (params.count("diaglog")) { + warning() << "--diaglog is deprecated and will be removed in a future release"; int x = params["diaglog"].as<int>(); if ( x < 0 || x > 7 ) { return Status(ErrorCodes::BadValue, "can't interpret --diaglog setting"); diff --git a/src/mongo/db/mongod_options_test.cpp b/src/mongo/db/mongod_options_test.cpp index dd53ecb0221..20fdfe7f8e3 100644 --- a/src/mongo/db/mongod_options_test.cpp +++ b/src/mongo/db/mongod_options_test.cpp @@ -685,8 +685,8 @@ namespace { else if (iterator->_dottedName == "diaglog") { ASSERT_EQUALS(iterator->_singleName, "diaglog"); ASSERT_EQUALS(iterator->_type, moe::Int); - ASSERT_EQUALS(iterator->_description, "0=off 1=W 2=R 3=both 7=W+some reads"); - ASSERT_EQUALS(iterator->_isVisible, true); + ASSERT_EQUALS(iterator->_description, "DEPRECATED: 0=off 1=W 2=R 3=both 7=W+some reads"); + ASSERT_EQUALS(iterator->_isVisible, false); ASSERT_TRUE(iterator->_default.isEmpty()); ASSERT_TRUE(iterator->_implicit.isEmpty()); ASSERT_EQUALS(iterator->_isComposing, false); |