Ver código fonte

Revert "Limit duration of file locks"

This reverts commit 6b1acd14d70b2e029aa56905518b3185a66d91c2.
Guillaume Ayoub 9 anos atrás
pai
commit
da1363f026
1 arquivos alterados com 0 adições e 8 exclusões
  1. 0 8
      radicale/storage.py

+ 0 - 8
radicale/storage.py

@@ -92,7 +92,6 @@ def load(configuration, logger):
 
 
 MIMETYPES = {"VADDRESSBOOK": "text/vcard", "VCALENDAR": "text/calendar"}
-MAX_FILE_LOCK_DURATION = 0.25
 
 
 def get_etag(text):
@@ -519,7 +518,6 @@ class Collection(BaseCollection):
     _waiters = []
     _lock_file = None
     _lock_file_locked = False
-    _lock_file_time = 0
     _readers = 0
     _writer = False
 
@@ -527,11 +525,6 @@ class Collection(BaseCollection):
     @contextmanager
     def acquire_lock(cls, mode):
         def condition():
-            # Prevent starvation of writers in other processes
-            if cls._lock_file_locked:
-                time_delta = time.time() - cls._lock_file_time
-                if time_delta < 0 or time_delta > MAX_FILE_LOCK_DURATION:
-                    return False
             if mode == "r":
                 return not cls._writer
             else:
@@ -585,7 +578,6 @@ class Collection(BaseCollection):
                     except OSError:
                         cls.logger.debug("Locking not supported")
                 cls._lock_file_locked = True
-                cls._lock_file_time = time.time()
         yield
         with cls._lock:
             if mode == "r":