Merge 71d87c2 into e67531c

mailer/engine.py

@@ -2,11 +2,12 @@
 import smtplib
 import logging
 
-import lockfile
 from socket import error as socket_error
 
 from django.conf import settings
 from django.core.mail import get_connection
+from lockfile import FileLock, AlreadyLocked, LockTimeout
+from lockfile.mkdirlockfile import MkdirLockFile
 
 from mailer.models import Message, MessageLog, RESULT_SUCCESS, RESULT_FAILURE
 
@@ -18,6 +19,8 @@
 # default behavior is to never wait for the lock to be available.
 LOCK_WAIT_TIMEOUT = getattr(settings, "MAILER_LOCK_WAIT_TIMEOUT", -1)
 
+LOCK_TYPE = getattr(settings, "MAILER_LOCK_TYPE", "FileLock")
+
 
 def prioritize():
     """
@@ -73,14 +76,20 @@ def _throttle_emails():
 
 def acquire_lock():
     logging.debug("acquiring lock...")
-    lock = lockfile.FileLock("send_mail")
+
+    if LOCK_TYPE == 'MkdirLockFile':
+        # mkdir(2)() system call as the basic lock mechanism
+        lock = MkdirLockFile("send_mail")
+    else:
+        # Default Lock Type
+        lock = FileLock("send_mail")
 
     try:
         lock.acquire(LOCK_WAIT_TIMEOUT)
-    except lockfile.AlreadyLocked:
+    except AlreadyLocked:
         logging.debug("lock already in place. quitting.")
         return False, lock
-    except lockfile.LockTimeout:
+    except LockTimeout:
         logging.debug("waiting for the lock timed out. quitting.")
         return False, lock
     logging.debug("acquired.")