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

clean up log messags

Browse Source
This commit is contained in:
Eliot Horowitz 2010-07-26 11:23:34 -04:00
parent 3083c08000
commit 55382a6b84
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/message.cpp
View File

@ -426,9 +426,9 @@ namespace mongo {
m.setData(md, true);
return true;
} catch ( const SocketException & e ) {
log(_logLevel) << "SocketException: " << e << endl;
log(_logLevel + e.shouldPrint() ? 0 : 1 ) << "SocketException: " << e << endl;
m.reset();
return false;
}
@ -496,11 +496,11 @@ namespace mongo {
if ( ret == -1 ) {
if ( errno != EAGAIN || _timeout == 0 ) {
log(_logLevel) << "MessagingPort " << context << " send() " << errnoWithDescription() << ' ' << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::SEND_ERROR );
} else {
if ( !serverAlive( farEnd.toString() ) ) {
log(_logLevel) << "MessagingPort " << context << " send() remote dead " << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::SEND_ERROR );
}
}
} else {
@ -540,11 +540,11 @@ namespace mongo {
if ( ret == -1 ) {
if ( errno != EAGAIN || _timeout == 0 ) {
log(_logLevel) << "MessagingPort " << context << " send() " << errnoWithDescription() << ' ' << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::SEND_ERROR );
} else {
if ( !serverAlive( farEnd.toString() ) ) {
log(_logLevel) << "MessagingPort " << context << " send() remote dead " << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::SEND_ERROR );
}
}
} else {
@ -570,17 +570,17 @@ namespace mongo {
int ret = ::recv( sock , buf , len , portRecvFlags );
if ( ret == 0 ) {
log(3) << "MessagingPort recv() conn closed? " << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::CLOSED );
}
if ( ret == -1 ) {
int e = errno;
if ( e != EAGAIN || _timeout == 0 ) {
log(_logLevel) << "MessagingPort recv() " << errnoWithDescription(e) << " " << farEnd.toString()<<endl;
throw SocketException();
throw SocketException( SocketException::RECV_ERROR );
} else {
if ( !serverAlive( farEnd.toString() ) ) {
log(_logLevel) << "MessagingPort recv() remote dead " << farEnd.toString() << endl;
throw SocketException();
throw SocketException( SocketException::RECV_ERROR );
}
}
} else {

8
util/message.h
View File

@ -392,7 +392,13 @@ struct OP_GETMORE : public MSGHEADER {
class SocketException : public DBException {
public:
SocketException() : DBException( "socket exception" , 9001 ){}
enum Type { CLOSED , RECV_ERROR , SEND_ERROR } type;
SocketException( Type t ) : DBException( "socket exception" , 9001 ) , type(t){}
bool shouldPrint() const {
return type != CLOSED;
}
};
MSGID nextMessageId();