mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

if $err is not the first element, complain. elsewhere we do not check all the way through, so it is important it is the first field

Browse Source
This commit is contained in:
dwight 2011-05-23 10:31:04 -04:00
parent b99eaa3387
commit 9da83a5530
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/dbclient.cpp
View File

@ -926,6 +926,24 @@ namespace mongo {
return true;
}
BSONElement getErrField(const BSONObj& o) {
BSONElement first = o.firstElement();
if( first.fieldName() == "$err" )
return first;
// temp - will be DEV only later
/*DEV*/
if( 1 ) {
BSONElement e = o["$err"];
if( !e.eoo() ) {
wassert(false);
}
return e;
}
return BSONElement();
}
void DBClientConnection::checkResponse( const char *data, int nReturned ) {
/* check for errors. the only one we really care about at
* this stage is "not master"
@ -934,7 +952,7 @@ namespace mongo {
if ( clientSet && nReturned ) {
assert(data);
BSONObj o(data);
BSONElement e = o["$err"];
BSONElement e = getErrField(o);
if ( e.type() == String && str::contains( e.valuestr() , "not master" ) ) {
clientSet->isntMaster();
}