SERVER-705 exit cleanly from db.cpp instead of instance.cpp

3 files changed, 5 insertions, 5 deletions

diff --git a/db/db.cpp b/db/db.cpp
index 489287d2773..ab2e6cb5020 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -65,6 +65,8 @@ namespace mongo {
     void pairWith(const char *remoteEnd, const char *arb);
     void setRecCacheSize(unsigned MB);
 
+    void exitCleanly( ExitCode code );
+
     const char *ourgetns() { 
         Client *c = currentClient.get();
         return c ? c->ns() : "";
@@ -224,6 +226,9 @@ namespace mongo {
             problem() << "SocketException in connThread, closing client connection" << endl;
             dbMsgPort.shutdown();
         }
+        catch ( const ClockSkewException &e ) {
+            exitCleanly( EXIT_CLOCK_SKEW );
+        }        
         catch ( std::exception &e ) {
             problem() << "Uncaught std::exception: " << e.what() << ", terminating" << endl;
             dbexit( EXIT_UNCAUGHT );
diff --git a/db/db.h b/db/db.h
index ed0a6982148..b8369e9d795 100644
--- a/db/db.h
+++ b/db/db.h
@@ -129,8 +129,6 @@ namespace mongo {
         }
     };
 
-    void exitCleanly( ExitCode code );
-
 } // namespace mongo
 
 #include "dbinfo.h"
diff --git a/db/instance.cpp b/db/instance.cpp
index 83cf0be4271..6b83ba4a0ad 100644
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -262,9 +262,6 @@ namespace mongo {
                     ss << " exception " + e.toString();
                     log = true;
                 }
-                catch ( ClockSkewException &e ) {
-                    exitCleanly( EXIT_CLOCK_SKEW );
-                }
             }
             else if ( op == dbKillCursors ) {
                 OPREAD;