diff options
| -rw-r--r--[-rwxr-xr-x] | buildscripts/makedist.py | 0 | ||||
| -rw-r--r-- | client/dbclient.h | 6 | ||||
| -rw-r--r-- | db/instance.cpp | 1 | ||||
| -rw-r--r-- | util/sock.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/buildscripts/makedist.py b/buildscripts/makedist.py index f153f6f53ce..f153f6f53ce 100755..100644 --- a/buildscripts/makedist.py +++ b/buildscripts/makedist.py diff --git a/client/dbclient.h b/client/dbclient.h index b810f04fa99..01785030f3f 100644 --- a/client/dbclient.h +++ b/client/dbclient.h @@ -253,10 +253,14 @@ namespace mongo { return (opts & QueryOption_CursorTailable) != 0; } + /** see QueryResult::ResultFlagType (db/dbmessage.h) for flag values + mostly these flags are for internal purposes - + ResultFlag_ErrSet is the possible exception to that + */ bool hasResultFlag( int flag ){ return (resultFlags & flag) != 0; } - public: + DBClientCursor( DBConnector *_connector, const string &_ns, BSONObj _query, int _nToReturn, int _nToSkip, const BSONObj *_fieldsToReturn, int queryOptions ) : connector(_connector), diff --git a/db/instance.cpp b/db/instance.cpp index ab5df1849af..02ab7ba81b0 100644 --- a/db/instance.cpp +++ b/db/instance.cpp @@ -655,7 +655,6 @@ namespace mongo { void shutdown() { - log() << "\t shutdown: going to close listening sockets..." << endl; ListeningSockets::get()->closeAll(); diff --git a/util/sock.h b/util/sock.h index 5798a71c8b8..d1a941692cd 100644 --- a/util/sock.h +++ b/util/sock.h @@ -263,7 +263,7 @@ namespace mongo { for ( set<int>::iterator i=s->begin(); i!=s->end(); i++ ){ int sock = *i; - log() << "going to close listening socket: " << sock << endl; + log() << "\t going to close listening socket: " << sock << endl; closesocket( sock ); } |