tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #458 from Unrud/flock

Browse Source 
Use flock locks for storage locking
This commit is contained in:
Guillaume Ayoub
2016-08-04 22:31:22 +02:00
committed by GitHub
parent b71664b322 8ce6d1af30
commit 9ba4a47897
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
radicale/storage.py
View File

@@ -648,7 +648,7 @@ class Collection(BaseCollection):
elif os.name == "posix":
_cmd = fcntl.LOCK_EX if mode == "w" else fcntl.LOCK_SH
try:
fcntl.lockf(cls._lock_file.fileno(), _cmd)
fcntl.flock(cls._lock_file.fileno(), _cmd)
except OSError:
cls.logger.debug("Locking not supported")
cls._lock_file_locked = True
@@ -668,7 +668,7 @@ class Collection(BaseCollection):
cls.logger.debug("Unlocking not supported")
elif os.name == "posix":
try:
fcntl.lockf(cls._lock_file.fileno(), fcntl.LOCK_UN)
fcntl.flock(cls._lock_file.fileno(), fcntl.LOCK_UN)
except OSError:
cls.logger.debug("Unlocking not supported")
cls._lock_file_locked = False