xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't log UserException's unless running with verbose on SERVER-1995

Browse Source
This commit is contained in:
Eliot Horowitz
2010-10-24 18:10:27 -04:00
parent f54e4a512b
commit 5a99b00eee
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
db/instance.cpp
View File

@@ -273,7 +273,7 @@ namespace mongo {
ss << opToString( op ) << " ";
int logThreshold = cmdLine.slowMS;
bool log = logLevel >= 1;
bool log = logLevel >= 1 || ++ctr % 512 == 0;
if ( op == dbQuery ) {
if ( handlePossibleShardedMessage( m , &dbresponse ) )
@@ -331,19 +331,21 @@ namespace mongo {
log = true;
}
}
catch ( UserException& ue ) {
tlog(3) << " Caught Assertion in " << opToString(op) << ", continuing " << ue.toString() << endl;
ss << " exception " << ue.toString();
}
catch ( AssertionException& e ) {
static int n;
tlog(3) << " Caught Assertion in " << opToString(op) << ", continuing" << endl;
ss << " exception " + e.toString();
log = ++n < 10;
tlog(3) << " Caught Assertion in " << opToString(op) << ", continuing " << e.toString() << endl;
ss << " exception " << e.toString();
log = true;
}
}
}
currentOp.ensureStarted();
currentOp.done();
int ms = currentOp.totalTimeMillis();
log = log || (logLevel >= 2 && ++ctr % 512 == 0);
//DEV log = true;
if ( log || ms > logThreshold ) {
if( logLevel < 3 && op == dbGetMore && strstr(ns, ".oplog.") && ms < 3000 && !log ) {