summaryrefslogtreecommitdiff
path: root/db/cloner.cpp
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2012-06-05 19:50:36 +0200
committerAntonin Kral <a.kral@bobek.cz>2012-06-05 19:50:36 +0200
commit291c9687fb2307dc22d1f269eb4d0aa98fe8cadc (patch)
treef46fac7bf8530d100aa55da89dfaa53490fbb350 /db/cloner.cpp
parent6d0f215499dda50fdba4a6f60ab359efe0054e0d (diff)
parent3703a282eca7e79e91f4bd651b1b861b76dc6c68 (diff)
downloadmongodb-291c9687fb2307dc22d1f269eb4d0aa98fe8cadc.tar.gz
Merge tag 'upstream/2.0.6'
Upstream version 2.0.6
Diffstat (limited to 'db/cloner.cpp')
-rw-r--r--db/cloner.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/db/cloner.cpp b/db/cloner.cpp
index 26c2f74..6d5b095 100644
--- a/db/cloner.cpp
+++ b/db/cloner.cpp
@@ -169,7 +169,8 @@ namespace mongo {
getDur().commitIfNeeded();
}
catch( UserException& e ) {
- log() << "warning: exception cloning object in " << from_collection << ' ' << e.what() << " obj:" << js.toString() << '\n';
+ error() << "error: exception cloning object in " << from_collection << ' ' << e.what() << " obj:" << js.toString() << '\n';
+ throw;
}
RARELY if ( time( 0 ) - saveLast > 60 ) {
@@ -238,7 +239,8 @@ namespace mongo {
getDur().commitIfNeeded();
}
catch( UserException& e ) {
- log() << "warning: exception cloning object in " << from_collection << ' ' << e.what() << " obj:" << js.toString() << '\n';
+ error() << "error: exception cloning object in " << from_collection << ' ' << e.what() << " obj:" << js.toString() << '\n';
+ throw;
}
}
}