sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.locks] drop "_lock", just "acquire" or "release", it's cleaner

Browse Source
This commit is contained in:
Fabio Erculiani
2013-12-15 12:10:19 +01:00
parent 1f2575204e
commit 0df7092e05
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/entropy/locks.py
View File

@@ -29,7 +29,7 @@ class SimpleFileLock(object):
"""
@classmethod
def acquire_lock(cls, lock_file, lock_map):
def acquire(cls, lock_file, lock_map):
"""
Make possible to protect a code region using an EXCLUSIVE, non-blocking
file lock. A lock map (dict) is required in order to register the lock
@@ -62,7 +62,7 @@ class SimpleFileLock(object):
raise
@classmethod
def release_lock(cls, lock_file, lock_map):
def release(cls, lock_file, lock_map):
"""
Release a previously acquired lock through acquire_lock().

10
lib/tests/locks.py
View File

@@ -22,22 +22,22 @@ class EntropyLocksTest(unittest.TestCase):
tmp_fd, tmp_path = const_mkstemp(prefix="test_simple_lock")
lock_map = {}
self.assertEquals(True, sfl.acquire_lock(tmp_path, lock_map))
self.assertEquals(True, sfl.acquire(tmp_path, lock_map))
self.assertIn(tmp_path, lock_map)
self.assertTrue(lock_map[tmp_path] is not None)
lock_map_new = {}
self.assertEquals(False, sfl.acquire_lock(tmp_path, lock_map_new))
self.assertEquals(False, sfl.acquire(tmp_path, lock_map_new))
self.assertNotIn(tmp_path, lock_map_new)
self.assertIn(tmp_path, lock_map)
sfl.release_lock(tmp_path, lock_map)
sfl.release(tmp_path, lock_map)
self.assertEquals(True, sfl.acquire_lock(tmp_path, lock_map_new))
self.assertEquals(True, sfl.acquire(tmp_path, lock_map_new))
self.assertIn(tmp_path, lock_map_new)
self.assertTrue(lock_map_new[tmp_path] is not None)
sfl.release_lock(tmp_path, lock_map_new)
sfl.release(tmp_path, lock_map_new)
finally:
if tmp_fd is not None:

4
magneto/src/magneto_app.py
View File

@@ -104,9 +104,9 @@ if __name__ == "__main__":
from entropy.locks import SimpleFileLock
lock_map = {}
magneto_lock = os.path.join(magneto_lock_dir, magneto_lock_file)
acquired = SimpleFileLock.acquire_lock(magneto_lock, lock_map)
acquired = SimpleFileLock.acquire(magneto_lock, lock_map)
def _unlock_func():
SimpleFileLock.release_lock(magneto_lock, lock_map)
SimpleFileLock.release(magneto_lock, lock_map)
try:
if acquired:

4
services/entropy-pkgdelta-generator
View File

@@ -277,7 +277,7 @@ if __name__ == "__main__":
lock_map = {}
acquired = False
if lock_file:
acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
acquired = SimpleFileLock.acquire(lock_file, lock_map)
if not acquired:
sys.stdout.write("cannot acquire lock on " + lock_file + "\n")
raise SystemExit(5)
@@ -285,7 +285,7 @@ if __name__ == "__main__":
rc = func(argv, quiet)
finally:
if acquired:
SimpleFileLock.release_lock(lock_file, lock_map)
SimpleFileLock.release(lock_file, lock_map)
else:
_print_help()
rc = 1

4
services/portage-repository-converter
View File

@@ -342,7 +342,7 @@ def _sync_tree(args):
acquired = False
try:
acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
acquired = SimpleFileLock.acquire(lock_file, lock_map)
if not acquired:
print_error(brown(_("Another instance is running.")))
@@ -377,7 +377,7 @@ def _sync_tree(args):
finally:
if acquired:
SimpleFileLock.release_lock(lock_file, lock_map)
SimpleFileLock.release(lock_file, lock_map)
if __name__ == "__main__":

4
services/repository-webinstall-generator
View File

@@ -528,7 +528,7 @@ def _generate(args):
acquired = False
try:
acquired = SimpleFileLock.acquire_lock(lock_file, lock_map)
acquired = SimpleFileLock.acquire(lock_file, lock_map)
if not acquired:
print_error(brown(_("Another instance is running.")))
return 1
@@ -560,7 +560,7 @@ def _generate(args):
finally:
if acquired:
SimpleFileLock.release_lock(lock_file, lock_map)
SimpleFileLock.release(lock_file, lock_map)
if __name__ == "__main__":