[checkmk-commits] Changed sites.mk and liveproxyd.mk writing to generic store functions

Module: check_mk Branch: master Commit: 20eab289169888a9e1965843f8132ce69c34b11b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20eab289169888… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 09:06:45 2016 +0100 Changed sites.mk and liveproxyd.mk writing to generic store functions Change-Id: If26152ed210f2731ecfe62e5747807faaa0991db --- web/htdocs/watolib.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 2bd7724..484029b 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3233,13 +3233,7 @@ def load_sites(): def save_sites(sites, activate=True): make_nagios_directory(multisite_dir) - - # Important: even write out sites if it's empty. The global 'sites' - # variable will otherwise survive in the Python interpreter of the - # Apache processes. - out = create_user_file(sites_mk, "w") - out.write(wato_fileheader()) - out.write("sites = \\\n%s\n" % pprint.pformat(sites)) + store.save_to_mk_file(sites_mk, "sites", sites) # Do not activate when just the site's global settings have # been edited @@ -3261,8 +3255,6 @@ def save_sites(sites, activate=True): def save_liveproxyd_config(sites): path = cmk.paths.default_config_dir + "/liveproxyd.mk" - out = create_user_file(path, "w") - out.write(wato_fileheader()) conf = {} for siteid, siteconf in sites.items(): @@ -3270,7 +3262,8 @@ def save_liveproxyd_config(sites): if type(s) == tuple and s[0] == "proxy": conf[siteid] = s[1] - out.write("sites = \\\n%s\n" % pprint.pformat(conf)) + store.save_to_mk_file(path, "sites", conf) + try: pidfile = cmk.paths.livestatus_unix_socket + "proxyd.pid" pid = int(file(pidfile).read().strip())