Merge branch 'master' of git.10gen.com:/data/gitroot/p

1 files changed, 8 insertions, 3 deletions

diff --git a/db/storage.cpp b/db/storage.cpp
index 8793f7b6090..da4901ea242 100644
--- a/db/storage.cpp
+++ b/db/storage.cpp
@@ -21,8 +21,9 @@ static void storeThread() {
     }

 }

 

+// Currently only called on program exit.
 void recCacheCloseAll() { 

-    BasicCached_RecStore::rc.writeDirty();

+    BasicCached_RecStore::rc.writeDirty( true );

     RecCache::tempStore.flush();

 }

 

@@ -73,7 +74,7 @@ inline void RecCache::writeIfDirty(Node *n) {
 }

 

 /* note that this is written in order, as much as possible, given that dirtyl is of type set. */

-void RecCache::writeDirty() { 

+void RecCache::writeDirty( bool rawLog ) { 

     try { 

         for( set<DiskLoc>::iterator i = dirtyl.begin(); i != dirtyl.end(); i++ ) { 

             map<DiskLoc, Node*>::iterator j = m.find(*i);

@@ -82,7 +83,11 @@ void RecCache::writeDirty() {
         }

     }

     catch(...) {

-        log() << "Problem: bad() in RecCache::writeDirty, file io error\n";

+        const char *message = "Problem: bad() in RecCache::writeDirty, file io error\n";
+        if ( rawLog )
+            rawOut( message );
+        else
+            ( log() << message ).flush();
     }

     dirtyl.clear();

 }