diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:19 +0100 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:46 +0100 |
| commit | 0b48f8ada2acb0de830b23f8cefc8e3fea28d915 (patch) | |
| tree | f7c2811269b6b53199412be2dd5ec02eea15d55d /util/net/message_server_port.cpp | |
| parent | 85f1cd56145b90a32b7ccdc750000deeed54fe22 (diff) | |
| parent | f0d9a01bccdaeb466c12c92057914bbfef59526c (diff) | |
| download | mongodb-0b48f8ada2acb0de830b23f8cefc8e3fea28d915.tar.gz | |
Merge branch 'upstream/2.0.2'
Diffstat (limited to 'util/net/message_server_port.cpp')
| -rw-r--r-- | util/net/message_server_port.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/util/net/message_server_port.cpp b/util/net/message_server_port.cpp index ca0b13d..ac13712 100644 --- a/util/net/message_server_port.cpp +++ b/util/net/message_server_port.cpp @@ -87,6 +87,10 @@ namespace mongo { log() << "ClockSkewException - shutting down" << endl; exitCleanly( EXIT_CLOCK_SKEW ); } + catch ( const DBException& e ) { // must be right above std::exception to avoid catching subclasses + log() << "DBException handling request, closing client connection: " << e << endl; + p->shutdown(); + } catch ( std::exception &e ) { error() << "Uncaught std::exception: " << e.what() << ", terminating" << endl; dbexit( EXIT_UNCAUGHT ); |