nicer error message when shard goes away SERVER-2543

1 files changed, 7 insertions, 2 deletions

diff --git a/s/shardconnection.cpp b/s/shardconnection.cpp
index 78f77bc8962..d05f5b17e75 100644
--- a/s/shardconnection.cpp
+++ b/s/shardconnection.cpp
@@ -148,12 +148,17 @@ namespace mongo {
                     pool.release( addr , conn );
                 }
                 else {
-                    log(LL_ERROR) << " couldn't unset sharding :( " << res << endl;
+                    error() << "unset sharding failed : " << res << endl;
                     delete conn;
                 }
             }
+            catch ( SocketException& e ) {
+                // server down or something
+                LOG(1) << "socket exception trying to unset sharding: " << e.toString() << endl;
+                delete conn;
+            }
             catch ( std::exception& e ) {
-                log(LL_ERROR) << "couldn't unset sharding : " << e.what() << endl;
+                error() << "couldn't unset sharding : " << e.what() << endl;
                 delete conn;
             }
         }