(#1178) - Make sure all stores are closed if an error occurs with one…

… of them.
pouchdb · Dec 29, 2013 · 18177d3 · 18177d3
1 parent f9922c7
commit 18177d3
Showing 1 changed file with 37 additions and 30 deletions.
diff --git a/lib/adapters/leveldb.js b/lib/adapters/leveldb.js
@@ -66,6 +66,38 @@ function LevelPouch(opts, callback) {
     uuid = fs.readFileSync(uuidPath);
   }
 
+  function closeStores(callback) {
+    var dbpath = path.resolve(opts.name);
+    var stores = [
+      path.join(dbpath, DOC_STORE),
+      path.join(dbpath, BY_SEQ_STORE),
+      path.join(dbpath, ATTACH_STORE),
+      path.join(dbpath, ATTACH_BINARY_STORE)
+    ];
+    var closed = 0;
+    stores.map(function (path) {
+      var store = STORES[path];
+      if (store) {
+        store.close(function () {
+          delete STORES[path];
+
+          if (++closed >= stores.length) {
+            done();
+          }
+        });
+      }
+      else {
+        if (++closed >= stores.length) {
+          done();
+        }
+      }
+    });
+
+    function done() {
+      call(callback, null);
+    }
+  }
+
   function initstore(store_name, encoding) {
 
     var dbpath = path.resolve(path.join(opts.name, store_name));
@@ -77,10 +109,14 @@ function LevelPouch(opts, callback) {
 
     function setup_store(err, ldb) {
       if (stores.err) {
+        if (ldb) {
+          ldb.close();
+        }
         return;
       }
       if (err) {
         stores.err = err;
+        closeStores();
         return call(callback, err);
       }
 
@@ -666,36 +702,7 @@ function LevelPouch(opts, callback) {
     if (!opened) {
       return call(callback, errors.NOT_OPEN);
     }
-
-    var dbpath = path.resolve(opts.name);
-    var stores = [
-      path.join(dbpath, DOC_STORE),
-      path.join(dbpath, BY_SEQ_STORE),
-      path.join(dbpath, ATTACH_STORE),
-      path.join(dbpath, ATTACH_BINARY_STORE)
-    ];
-    var closed = 0;
-    stores.map(function (path) {
-      var store = STORES[path];
-      if (store) {
-        store.close(function () {
-          delete STORES[path];
-
-          if (++closed >= stores.length) {
-            done();
-          }
-        });
-      }
-      else {
-        if (++closed >= stores.length) {
-          done();
-        }
-      }
-    });
-
-    function done() {
-      call(callback, null);
-    }
+    closeStores(callback);
   };
 
   api._getRevisionTree = function (docId, callback) {