summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorShaun Verch <shaun.verch@10gen.com>2013-08-08 15:57:56 -0400
committerShaun Verch <shaun.verch@10gen.com>2013-09-05 13:49:34 -0400
commitace97f9b21cb9a043020e8ecab4309e35461df09 (patch)
tree7a89daa04c291039be18c51aa165058e53e04563 /src/mongo/db
parent43e7502572b4a217eb3f57eee479585ae2a2d19e (diff)
downloadmongo-ace97f9b21cb9a043020e8ecab4309e35461df09.tar.gz
SERVER-8510 Remove configuration variable manager and add option group for command line parsing
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/initialize_server_global_state.cpp2
-rw-r--r--src/mongo/db/mongod.vcxproj12
-rw-r--r--src/mongo/db/mongod.vcxproj.filters9
3 files changed, 1 insertions, 22 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
index 4c01a113d9a..d8d29d3fd86 100644
--- a/src/mongo/db/initialize_server_global_state.cpp
+++ b/src/mongo/db/initialize_server_global_state.cpp
@@ -173,7 +173,7 @@ namespace mongo {
}
MONGO_INITIALIZER_GENERAL(ServerLogRedirection,
- ("GlobalLogManager", "globalVariablesConfigured"),
+ ("GlobalLogManager", "completedStartupConfig"),
("default"))(
InitializerContext*) {
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index 96b238f39dd..3ec79fb6c0f 100644
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -1909,17 +1909,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">..\..\third_party\v8\src</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\third_party\v8\src\zone.cc" />
- <ClCompile Include="..\base\configuration_variable_manager.cpp" />
- <ClCompile Include="..\base\configuration_variable_manager_test.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusDebug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Win2008PlusRelease|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\base\counter_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -4164,7 +4153,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
</ClInclude>
<ClInclude Include="..\..\third_party\v8\src\zone-inl.h" />
<ClInclude Include="..\..\third_party\v8\src\zone.h" />
- <ClInclude Include="..\base\configuration_variable_manager.h" />
<ClInclude Include="..\base\counter.h" />
<ClInclude Include="..\base\disallow_copying.h" />
<ClInclude Include="..\base\error_codes.h" />
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index 82a556eaefa..c252ef2faa1 100644
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -734,9 +734,6 @@
<ClCompile Include="..\util\safe_num.cpp">
<Filter>util\Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\base\configuration_variable_manager.cpp">
- <Filter>base</Filter>
- </ClCompile>
<ClCompile Include="..\base\global_initializer.cpp">
<Filter>base</Filter>
</ClCompile>
@@ -1955,9 +1952,6 @@
<ClCompile Include="auth\privilege_set_test.cpp">
<Filter>db\auth</Filter>
</ClCompile>
- <ClCompile Include="..\base\configuration_variable_manager_test.cpp">
- <Filter>base</Filter>
- </ClCompile>
<ClCompile Include="..\base\counter_test.cpp">
<Filter>base</Filter>
</ClCompile>
@@ -3020,9 +3014,6 @@
<ClInclude Include="..\util\safe_num.h">
<Filter>util\Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\base\configuration_variable_manager.h">
- <Filter>base</Filter>
- </ClInclude>
<ClInclude Include="..\base\global_initializer.h">
<Filter>base</Filter>
</ClInclude>