better error messages on network errors

2 files changed, 3 insertions, 4 deletions

diff --git a/client/dbclient.cpp b/client/dbclient.cpp
index 41b75985bfe..828e4d05c33 100644
--- a/client/dbclient.cpp
+++ b/client/dbclient.cpp
@@ -478,7 +478,7 @@ namespace mongo {
         auto_ptr<DBClientCursor> c =
             this->query(ns, query, 1, 0, fieldsToReturn, queryOptions);
 
-        uassert( 10276 ,  "DBClientBase::findOne: transport error", c.get() );
+        uassert( 10276 ,  str::stream() << "DBClientBase::findOne: transport error: " << getServerAddress() , c.get() );
 
         if ( c->hasResultFlag( ResultFlag_ShardConfigStale ) )
             throw StaleConfigException( ns , "findOne has stale config" );
@@ -842,7 +842,7 @@ namespace mongo {
             if ( !port().call(toSend, response) ) {
                 failed = true;
                 if ( assertOk )
-                    uassert( 10278 , "dbclient error communicating with server", false);
+                    uasserted( 10278 , str::stream() << "dbclient error communicating with server: " << getServerAddress() );
                 return false;
             }
         }
diff --git a/client/dbclient.h b/client/dbclient.h
index eaa63944423..8598ae2e32a 100644
--- a/client/dbclient.h
+++ b/client/dbclient.h
@@ -332,8 +332,6 @@ namespace mongo {
 
         /* used by QueryOption_Exhaust.  To use that your subclass must implement this. */
         virtual void recv( Message& m ) { assert(false); }
-
-        virtual string getServerAddress() const = 0;
     };
 
     /**
@@ -363,6 +361,7 @@ namespace mongo {
         */
         virtual BSONObj findOne(const string &ns, const Query& query, const BSONObj *fieldsToReturn = 0, int queryOptions = 0);
 
+        virtual string getServerAddress() const = 0;
 
     };