diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/db.sln | 1 | ||||
| -rw-r--r-- | db/repl.cpp | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/db/db.sln b/db/db.sln index 8d12cbf4cf6..bdf1581bb8e 100644 --- a/db/db.sln +++ b/db/db.sln @@ -33,7 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72E EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shell", "shell", "{2CABB3B8-C9A6-478D-9463-0B37799ED708}"
ProjectSection(SolutionItems) = preProject
- ..\shell\dbshell.cpp = ..\shell\dbshell.cpp
..\shell\ShellUtils.cpp = ..\shell\ShellUtils.cpp
EndProjectSection
EndProject
diff --git a/db/repl.cpp b/db/repl.cpp index 5fe55c3fa75..85aa7299e3a 100644 --- a/db/repl.cpp +++ b/db/repl.cpp @@ -1136,14 +1136,18 @@ namespace mongo { } catch ( AssertionException& e ) { if ( e.severe() ) { - log() << "replMain caught AssertionException, sleeping 1 minutes" << endl; + log() << "replMain exception " << e.what() << ", sleeping 1 minutes" << endl; return 60; } else { - log() << e.toString() << '\n'; + log() << "replMain exception " << e.what() << '\n'; } replInfo = "replMain caught AssertionException"; } + catch ( ... ) { + log() << "unexpected assertion during replication. replication will halt" << endl; + replAllDead = "caught unexpected assertion during replication"; + } if ( !ok ) s->resetConnection(); } |