flock => LockFile

hung_timeout => lifetime

1 files changed, 4 insertions, 4 deletions

diff --git a/cron/run_queue b/cron/run_queue
index a6082c16f..177ab921b 100644
--- a/cron/run_queue
+++ b/cron/run_queue
@@ -24,7 +24,7 @@ import os
 import sys
 import paths
 from Mailman import OutgoingQueue
-from Mailman import flock
+from Mailman.LockFile import LockFile
 from Mailman import mm_cfg
 
 # Work around known problems with some RedHat cron daemons
@@ -33,9 +33,9 @@ signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
 def main():
     path = os.path.join(mm_cfg.LOCK_DIR, 'mmqueue_run.lock')
-    lockfile = flock.FileLock(path,
-                              # running the queue can take a long time
-                              hung_timeout=14400)
+    lockfile = LockFile(path,
+                        # running the queue can take a long time
+                        lifetime=14400)
     lockfile.lock()
     try:
         OutgoingQueue.processQueue()