summaryrefslogtreecommitdiff
path: root/src/mailman/bin/master.py
diff options
context:
space:
mode:
authorBarry Warsaw2010-11-27 15:54:22 -0500
committerBarry Warsaw2010-11-27 15:54:22 -0500
commitecb3dbbacd350845ae11834ac42c17469811bdfa (patch)
tree1a26c817c4dbbc7604acbb70bf0a144e9f34153d /src/mailman/bin/master.py
parentd5da4860511d35142ffa7ad83f9d60753399344f (diff)
downloadmailman-ecb3dbbacd350845ae11834ac42c17469811bdfa.tar.gz
mailman-ecb3dbbacd350845ae11834ac42c17469811bdfa.tar.zst
mailman-ecb3dbbacd350845ae11834ac42c17469811bdfa.zip
Diffstat (limited to 'src/mailman/bin/master.py')
-rw-r--r--src/mailman/bin/master.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py
index 0d0276fdb..263d65a39 100644
--- a/src/mailman/bin/master.py
+++ b/src/mailman/bin/master.py
@@ -34,8 +34,8 @@ import logging
from datetime import timedelta
from flufl.enum import Enum
+from flufl.lock import Lock, TimeOutError
from lazr.config import as_boolean
-from locknix import lockfile
from mailman.config import config
from mailman.core.i18n import _
@@ -165,11 +165,11 @@ def acquire_lock_1(force):
:return: The master queue runner lock.
:raises: `TimeOutError` if the lock could not be acquired.
"""
- lock = lockfile.Lock(config.LOCK_FILE, LOCK_LIFETIME)
+ lock = Lock(config.LOCK_FILE, LOCK_LIFETIME)
try:
lock.lock(timedelta(seconds=0.1))
return lock
- except lockfile.TimeOutError:
+ except TimeOutError:
if not force:
raise
# Force removal of lock first.
@@ -191,7 +191,7 @@ def acquire_lock(force):
try:
lock = acquire_lock_1(force)
return lock
- except lockfile.TimeOutError:
+ except TimeOutError:
status = master_state()
if status == WatcherState.conflict:
# Hostname matches and process exists.