diff options
Diffstat (limited to 'Mailman/database/__init__.py')
| -rw-r--r-- | Mailman/database/__init__.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Mailman/database/__init__.py b/Mailman/database/__init__.py index e9c338952..acc74642f 100644 --- a/Mailman/database/__init__.py +++ b/Mailman/database/__init__.py @@ -25,10 +25,11 @@ __all__ = [ import os +from locknix.lockfile import Lock from elixir import objectstore from zope.interface import implements -from Mailman.interfaces import IDatabase, IPending +from Mailman.interfaces import IDatabase from Mailman.database.listmanager import ListManager from Mailman.database.usermanager import UserManager from Mailman.database.messagestore import MessageStore @@ -55,14 +56,13 @@ class StockDatabase: self.pendings = None self.requests = None - def initialize(self): + def initialize(self, debug=None): from Mailman.configuration import config from Mailman.database import model - from Mailman.lockfile import LockFile # Serialize this so we don't get multiple processes trying to create # the database at the same time. - with LockFile(os.path.join(config.LOCK_DIR, 'dbcreate.lck')): - model.initialize() + with Lock(os.path.join(config.LOCK_DIR, 'dbcreate.lck')): + model.initialize(debug) self.list_manager = ListManager() self.user_manager = UserManager() self.message_store = MessageStore() @@ -72,3 +72,7 @@ class StockDatabase: def flush(self): objectstore.flush() + + def _reset(self): + model._reset() + |