[checkmk-commits] User connections persistance is now using generic store functions

Module: check_mk Branch: master Commit: 7d9467cbb35808d2524384fa90c8faf083c6fc3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d9467cbb35808… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:24:36 2017 +0100 User connections persistance is now using generic store functions Change-Id: I29118e7bd06e0e82a1d1c82f33c5d7601e611ba9 --- web/htdocs/userdb.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index bcaa025..f863e8d 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1061,35 +1061,16 @@ def declare_custom_user_attrs(): # '----------------------------------------------------------------------' def load_connection_config(lock=False): - user_connections = [] - - filename = multisite_dir + "user_connections.mk" - if not os.path.exists(filename): - return user_connections - - try: - context = { - "user_connections": user_connections, - } - execfile(filename, context, context) - return context["user_connections"] - - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - return user_connections + filename = os.path.join(multisite_dir, "user_connections.mk") + return store.load_from_mk_file(filename, "user_connections", default=[], lock=lock) def save_connection_config(connections, base_dir=None): if not base_dir: base_dir = multisite_dir - - output = "# Written by Multisite UserDB\n# encoding: utf-8\n\n" - output += "user_connections = \\\n%s\n\n" % pprint.pformat(connections) - make_nagios_directory(base_dir) - store.save_file(os.path.join(base_dir, "user_connections.mk"), output) + store.save_to_mk_file(os.path.join(base_dir, "user_connections.mk"), + "user_connections", connections) #. # .--ConnectorAPI--------------------------------------------------------.