[checkmk-commits] WATO: Cleaned up module global state

Module: check_mk Branch: master Commit: 339634e6f9998aed13c8693f15fcde199d8966a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339634e6f9998a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 19:42:36 2019 +0100 WATO: Cleaned up module global state The sidebar reload state is now held by the request global need_sidebar_reload instead of a module global variable. Change-Id: Ie8b51ecc526b95624e4c18ec47b59afd961f6f7f --- cmk/gui/watolib/__init__.py | 2 -- cmk/gui/watolib/sidebar_reload.py | 13 +++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 45273c7..16d377f 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -314,8 +314,6 @@ def load_watolib_plugins(): # robust way for doing something like this. If it is locked before, it can now happen # that this call unlocks the wider locking when calling this funktion in a wrong way. def init_wato_datastructures(with_wato_lock=False): - cmk.gui.watolib.sidebar_reload.reset() - if os.path.exists(ConfigDomainCACertificates.trusted_cas_file) and\ not _need_to_create_sample_config(): return diff --git a/cmk/gui/watolib/sidebar_reload.py b/cmk/gui/watolib/sidebar_reload.py index f13198a..d4f7e7b 100644 --- a/cmk/gui/watolib/sidebar_reload.py +++ b/cmk/gui/watolib/sidebar_reload.py @@ -24,19 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# TODO: Cleanup this module level state -_need_sidebar_reload = None - - -def reset(): - global _need_sidebar_reload - _need_sidebar_reload = None +from cmk.gui.globals import current_app def need_sidebar_reload(): - global _need_sidebar_reload - _need_sidebar_reload = True + current_app.g["need_sidebar_reload"] = True def is_sidebar_reload_needed(): - return _need_sidebar_reload + return current_app.g.get("need_sidebar_reload", False)