summaryrefslogtreecommitdiff
path: root/src/mongo/tools
diff options
context:
space:
mode:
authorHari Khalsa <hkhalsa@10gen.com>2014-08-22 14:31:33 -0400
committerHari Khalsa <hkhalsa@10gen.com>2014-08-26 12:03:27 -0400
commit2c403aab664bb25704d984c48583d80701a5267b (patch)
treecd0856464104034dc88d6e76c1f4548d640f2b78 /src/mongo/tools
parent7b1fb9c442e6c97df18d0ecba47a21adaaf1d65b (diff)
downloadmongo-2c403aab664bb25704d984c48583d80701a5267b.tar.gz
SERVER-14413 move globalStorageEngine inside of global env
Diffstat (limited to 'src/mongo/tools')
-rw-r--r--src/mongo/tools/tool.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/tools/tool.cpp b/src/mongo/tools/tool.cpp
index 0921b358338..045d830d77c 100644
--- a/src/mongo/tools/tool.cpp
+++ b/src/mongo/tools/tool.cpp
@@ -79,8 +79,6 @@ namespace mongo {
new AuthzManagerExternalStateMock()));
repl::ReplSettings replSettings;
repl::setGlobalReplicationCoordinator(new repl::ReplicationCoordinatorMock(replSettings));
- // We don't use the noop environment here since we actually need the storage engine...
- setGlobalEnvironment(new GlobalEnvironmentMongoD());
return Status::OK();
}
@@ -134,7 +132,7 @@ namespace mongo {
Client::initThread("tools");
storageGlobalParams.dbpath = toolGlobalParams.dbpath;
try {
- initGlobalStorageEngine();
+ getGlobalEnvironment()->setGlobalStorageEngine(storageGlobalParams.engine);
}
catch (const DBException& ex) {
if (ex.getCode() == ErrorCodes::DBPathInUse) {