New file lock implementation using flock()

Hopefully this should avoid some of the race conditions observed when
using the softer file lock.

Refs #620

huey/tests/test_storage.py

@@ -298,7 +298,7 @@ def tearDown(self):
 
     def get_huey(self):
         return Huey('test-file-storage', storage_class=FileStorage,
-                    path=self.path, levels=2)
+                    path=self.path, levels=2, use_thread_lock=True)
 
     def test_filesystem_result_store(self):
         s = self.huey.storage

huey/utils.py

@@ -5,6 +5,10 @@
 import os
 import sys
 import time
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
 
 
 Error = namedtuple('Error', ('metadata',))
@@ -130,9 +134,8 @@ def decode(s):
 
 
 class FileLock(object):
-    def __init__(self, filename, interval=0.01):
+    def __init__(self, filename):
         self.filename = filename
-        self.interval = interval
         self.fd = None
 
         dirname = os.path.dirname(filename)
@@ -142,21 +145,15 @@ def __init__(self, filename, interval=0.01):
             os.unlink(self.filename)
 
     def acquire(self):
-        flags = os.O_CREAT | os.O_EXCL | os.O_RDWR
-        while True:
-            try:
-                self.fd = os.open(self.filename, flags)
-                break
-            except OSError as exc:
-                if exc.errno != errno.EEXIST:
-                    raise
-                time.sleep(self.interval)
+        flags = os.O_CREAT | os.O_TRUNC | os.O_RDWR
+        self.fd = os.open(self.filename, flags)
+        fcntl.flock(self.fd, fcntl.LOCK_EX)
 
     def release(self):
         if self.fd is not None:
             fd, self.fd = self.fd, None
+            fcntl.flock(fd, fcntl.LOCK_UN)
             os.close(fd)
-            os.unlink(self.filename)
 
     def __enter__(self):
         self.acquire()