diff options
Diffstat (limited to 'Mailman/database')
| -rw-r--r-- | Mailman/database/__init__.py | 9 | ||||
| -rw-r--r-- | Mailman/database/usermanager.py | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Mailman/database/__init__.py b/Mailman/database/__init__.py index 9c3cf39ea..e9c338952 100644 --- a/Mailman/database/__init__.py +++ b/Mailman/database/__init__.py @@ -56,13 +56,12 @@ class StockDatabase: self.requests = None def initialize(self): - from Mailman.LockFile import LockFile from Mailman.configuration import config from Mailman.database import model - # Serialize this so we don't get multiple processes trying to create the - # database at the same time. - lockfile = os.path.join(config.LOCK_DIR, '<dbcreatelock>') - with LockFile(lockfile): + 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() self.list_manager = ListManager() self.user_manager = UserManager() diff --git a/Mailman/database/usermanager.py b/Mailman/database/usermanager.py index 038427879..1958080fd 100644 --- a/Mailman/database/usermanager.py +++ b/Mailman/database/usermanager.py @@ -25,7 +25,6 @@ from elixir import * from zope.interface import implements from Mailman import Errors -from Mailman.LockFile import LockFile from Mailman.configuration import config from Mailman.database.model import * from Mailman.interfaces import IUserManager |