tweak to _logOp() teeny bit faster

This commit is contained in:
Dwight Merriman
2010-05-30 15:04:20 -04:00
parent 811980a7eb
commit e9d175a86c
2 changed files with 11 additions and 6 deletions

View File

@@ -1732,8 +1732,12 @@ namespace mongo {
void startReplication() {
/* if we are going to be a replica set, we aren't doing other forms of replication. */
if( !cmdLine.replSet.empty() )
if( !cmdLine.replSet.empty() ) {
if( replSettings.slave || replSettings.master || replPair ) {
log() << "ERROR: can't use --slave or --master replication options with --replSet" << endl;
}
return;
}
/* this was just to see if anything locks for longer than it should -- we need to be careful
not to be locked when trying to connect() or query() the other side.