[checkmk-commits] reduced number of store.load_* operations

Module: check_mk Branch: master Commit: 969b794c4508284c6b758abd6071405baaf2470a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969b794c450828… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 15 18:19:09 2018 +0100 reduced number of store.load_* operations CMK-1271 Change-Id: I15d56f01b31a449584f4b55a0857046377d99195 --- cmk/gui/config.py | 6 ++++++ cmk/gui/htmllib.py | 2 +- cmk/gui/inventory.py | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index b17b466..446feb1 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -443,6 +443,7 @@ class LoggedInUser(object): self._load_attributes() self._load_permissions() self._load_site_config() + self._button_counts = None # TODO: Clean up that baserole_* stuff? def _load_roles(self): @@ -511,6 +512,11 @@ class LoggedInUser(object): def _load_site_config(self): self.siteconf = self.load_file("siteconfig", {}) + def get_button_counts(self): + if not self._button_counts: + self._button_counts = self.load_file("buttoncounts", {}) + return self._button_counts + def save_site_config(self): self.save_file("siteconfig", self.siteconf) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 57c8180..fbf1ef7 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2119,7 +2119,7 @@ class html(HTMLGenerator): self.close_div() def get_button_counts(self): - return config.user.load_file("buttoncounts", {}) + return config.user.get_button_counts() def empty_icon_button(self): self.write(self.render_icon("images/trans.png", cssclass="iconbutton trans")) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index ab78677..f1b1f35 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -260,6 +260,9 @@ def _filter_tree(struct_tree): def _get_permitted_inventory_paths(): + cache_varname = "permitted_inventory_paths" + if html.is_cached(cache_varname): + return html.get_cached(cache_varname) """ Returns either a list of permitted paths or None in case the user is allowed to see the whole tree. @@ -267,6 +270,7 @@ None in case the user is allowed to see the whole tree. contact_groups = userdb.load_group_information().get("contact", {}) user_groups = userdb.contactgroups_of_user(config.user.id) if not user_groups: + html.set_cache(cache_varname, None) return None forbid_whole_tree = False @@ -275,9 +279,11 @@ None in case the user is allowed to see the whole tree. inventory_paths = contact_groups.get(user_group, {}).get('inventory_paths') if inventory_paths is None: # Old configuration: no paths configured means 'allow_all' + html.set_cache(cache_varname, None) return None if inventory_paths == "allow_all": + html.set_cache(cache_varname, None) return None elif inventory_paths == "forbid_all": @@ -294,7 +300,10 @@ None in case the user is allowed to see the whole tree. permitted_paths.append((parsed, entry.get("attributes"))) if forbid_whole_tree and not permitted_paths: + html.set_cache(cache_varname, []) return [] + + html.set_cache(cache_varname, permitted_paths) return permitted_paths