[checkmk-commits] Cleaned up store.*lock() call sites; Removed aliases in lib

Module: check_mk Branch: master Commit: 858b0e3ce1194da96f8cbed5ba0f1d0b0547f0c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858b0e3ce1194d… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Feb 16 19:36:50 2018 +0100 Cleaned up store.*lock() call sites; Removed aliases in lib Change-Id: If539cc81d28200dd885db6b4efd574c94aae0d29 --- web/htdocs/cron.py | 3 ++- web/htdocs/index.py | 3 ++- web/htdocs/lib.py | 5 ----- web/htdocs/userdb.py | 2 +- web/htdocs/watolib.py | 16 ++++++++-------- web/plugins/userdb/hook_auth.py | 4 ++-- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/web/htdocs/cron.py b/web/htdocs/cron.py index 1346fd4..5c14737 100644 --- a/web/htdocs/cron.py +++ b/web/htdocs/cron.py @@ -29,6 +29,7 @@ import traceback from lib import * from log import logger import cmk.paths +import cmk.store as store from gui_exceptions import MKGeneralException @@ -68,7 +69,7 @@ def page_run_cron(): if time.time() - last_run < 59: raise MKGeneralException("Cron called too early. Skipping.") file(lock_file, "w") # touches the file - aquire_lock(lock_file) + store.aquire_lock(lock_file) logger.debug("Starting cron jobs") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 621c15f..22ea98a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -39,6 +39,7 @@ from lib import * import log from html_mod_python import html_mod_python, FinalizeRequest import cmk.paths +import cmk.store as store from gui_exceptions import \ MKUserError, \ @@ -210,7 +211,7 @@ def ensure_general_access(): def finalize_request(): - release_all_locks() + store.release_all_locks() userdb.finalize() sites.disconnect() html.finalize() diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e1a1c0c..712f20a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -151,11 +151,6 @@ def tryint(x): return x -aquire_lock = store.aquire_lock -release_lock = store.release_lock -have_lock = store.have_lock -release_all_locks = store.release_all_locks - # Splits a word into sequences of numbers and non-numbers. # Creates a tuple from these where the number are converted # into int datatype. That way a naturual sort can be diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 20bcfa0..e02d1ce 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -700,7 +700,7 @@ def save_users(profiles): # Release the lock to make other threads access possible again asap # This lock is set by load_users() only in the case something is expected # to be written (like during user syncs, wato, ...) - release_lock(root_dir + "contacts.mk") + store.release_lock(root_dir + "contacts.mk") # populate the users cache # TODO: Can we clean this up? diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fd6c44a..ff0b175 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4613,7 +4613,7 @@ class ActivateChanges(object): path = site_changes_path(site_id) if lock: - aquire_lock(path) + store.aquire_lock(path) changes = [] try: @@ -4627,7 +4627,7 @@ class ActivateChanges(object): raise except: if lock: - release_lock(path) + store.release_lock(path) raise return changes @@ -4656,7 +4656,7 @@ class ActivateChanges(object): def _save_change(self, site_id, change_spec): path = site_changes_path(site_id) try: - aquire_lock(path) + store.aquire_lock(path) with open(path, "a+") as f: f.write(repr(change_spec)+"\0") @@ -4669,7 +4669,7 @@ class ActivateChanges(object): raise MKGeneralException(_("Cannot write file \"%s\": %s") % (path, e)) finally: - release_lock(path) + store.release_lock(path) # Returns a list of changes ordered by time and grouped by the change. @@ -6269,7 +6269,7 @@ def export_hosttags_to_php(hosttags, auxtags): tempfile = path + '.tmp' lockfile = path + '.state' file(lockfile, 'a') - aquire_lock(lockfile) + store.aquire_lock(lockfile) # Transform WATO internal data structures into easier usable ones hosttags_dict = {} @@ -6333,7 +6333,7 @@ function all_taggroup_choices($object_tags) { ''' % (format_php(hosttags_dict), format_php(auxtags_dict))) # Now really replace the destination file os.rename(tempfile, path) - release_lock(lockfile) + store.release_lock(lockfile) os.unlink(lockfile) @@ -9822,11 +9822,11 @@ def folder_preserving_link(add_vars): def lock_exclusive(): - aquire_lock(cmk.paths.default_config_dir + "/multisite.mk") + store.aquire_lock(cmk.paths.default_config_dir + "/multisite.mk") def unlock_exclusive(): - release_lock(cmk.paths.default_config_dir + "/multisite.mk") + store.release_lock(cmk.paths.default_config_dir + "/multisite.mk") def git_command(args): diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index b31ba6f..6ad4ae8 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -100,7 +100,7 @@ def create_php_file(callee, users, role_permissions, groups): tempfile = g_auth_base_dir + '/auth.php.tmp' lockfile = g_auth_base_dir + '/auth.php.state' file(lockfile, "a") - aquire_lock(lockfile) + store.aquire_lock(lockfile) # First write a temp file and then do a move to prevent syntax errors # when reading half written files during creating that new file @@ -214,7 +214,7 @@ function permitted_maps($username) { # Now really replace the file os.rename(tempfile, g_auth_base_dir + '/auth.php') - release_lock(lockfile) + store.release_lock(lockfile) def create_auth_file(callee, users):