Commit c37bcfa3 by Julien Muchembled

importer: fix closure of ZODB, and also do it when the import is finished

parent 6608a868
...@@ -420,7 +420,7 @@ class ImporterDatabaseManager(DatabaseManager): ...@@ -420,7 +420,7 @@ class ImporterDatabaseManager(DatabaseManager):
if self._writeback: if self._writeback:
self._writeback.close() self._writeback.close()
self.db.close() self.db.close()
if isinstance(self.zodb, list): # _setup called if isinstance(self.zodb, tuple): # _setup called
for zodb in self.zodb: for zodb in self.zodb:
zodb.close() zodb.close()
...@@ -518,6 +518,9 @@ class ImporterDatabaseManager(DatabaseManager): ...@@ -518,6 +518,9 @@ class ImporterDatabaseManager(DatabaseManager):
_fetchObject _fetchObject
""".split(): """.split():
setattr(self, x, getattr(self.db, x)) setattr(self, x, getattr(self.db, x))
for zodb in self.zodb:
zodb.close()
self.zodb = None
def _iter_zodb(self, zodb_list): def _iter_zodb(self, zodb_list):
util.setproctitle('neostorage: import') util.setproctitle('neostorage: import')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment