summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDwight <dmerriman@gmail.com>2008-08-19 16:12:13 -0400
committerDwight <dmerriman@gmail.com>2008-08-19 16:12:13 -0400
commitbfb61b7795d1fbef980a41889021078f00fd2fa2 (patch)
tree69a8c37d066332d7296aff3b3971a147b565e71e /db
parent4e922d955bf8975059bf8fc39010027aa9f0882e (diff)
downloadmongo-bfb61b7795d1fbef980a41889021078f00fd2fa2.tar.gz
cleanup
Diffstat (limited to 'db')
-rw-r--r--db/db.cpp9
-rw-r--r--db/db.vcproj4
-rw-r--r--db/repl.cpp5
3 files changed, 6 insertions, 12 deletions
diff --git a/db/db.cpp b/db/db.cpp
index b3eb9e699ce..0960e5c9cbb 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -839,26 +839,22 @@ int main(int argc, char* argv[], char *envp[] )
msg(m, "127.0.0.1", thePort);
- goingAway = true;
return 0;
}
if( strcmp(argv[1], "msglots") == 0 ) {
msg(argc >= 3 ? argv[2] : "ping", 1000);
- goingAway = true;
return 0;
}
if( strcmp( argv[1], "testclient") == 0 ) {
testClient();
- goingAway = true; return 0;
+ return 0;
}
if( strcmp(argv[1], "zzz") == 0 ) {
msg(argc >= 3 ? argv[2] : "ping", 1000);
- goingAway = true;
return 0;
}
if( strcmp(argv[1], "run") == 0 ) {
initAndListen(port, dbpath);
- goingAway = true;
return 0;
}
if( strcmp(argv[1], "longmsg") == 0 ) {
@@ -868,7 +864,6 @@ int main(int argc, char* argv[], char *envp[] )
buf[799998] = 'b';
buf[0] = 'c';
msg(buf);
- goingAway = true;
return 0;
}
@@ -910,7 +905,6 @@ int main(int argc, char* argv[], char *envp[] )
initAndListen(port, dbpath, appsrvPath);
- goingAway = true;
exit(0);
}
@@ -929,7 +923,6 @@ int main(int argc, char* argv[], char *envp[] )
cout << " --oplog<n> 0=off 1=W 2=R 3=both 7=W+some reads" << endl;
cout << endl;
- goingAway = true;
return 0;
}
diff --git a/db/db.vcproj b/db/db.vcproj
index 8f74c979dc9..94d10bcc2a9 100644
--- a/db/db.vcproj
+++ b/db/db.vcproj
@@ -349,10 +349,6 @@
>
</File>
<File
- RelativePath="..\grid\protoimpl.h"
- >
- </File>
- <File
RelativePath=".\query.h"
>
</File>
diff --git a/db/repl.cpp b/db/repl.cpp
index aa677aca7f0..61488c8b5cd 100644
--- a/db/repl.cpp
+++ b/db/repl.cpp
@@ -187,6 +187,11 @@ bool Source::resync(string db) {
}
log() << "resync: done " << db << endl;
+
+ /* add the db to our dbs array which we will write back to local.sources.
+ note we are not in a consistent state until the oplog gets applied,
+ which happens next when this returns.
+ */
dbs.insert(db);
return true;
}