[checkmk-commits] Check_MK Git: check_mk: Removed duplicate code in wato/config code

Module: check_mk Branch: master Commit: 0e8d26231e7260bf8c8a845ae4dc33922efbc2d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e8d26231e7260… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:36:12 2012 +0200 Removed duplicate code in wato/config code --- web/htdocs/wato.py | 4 +--- web/plugins/icons/builtin.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4876b55..b24b0f3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6523,9 +6523,7 @@ def encrypt_password(password, salt = None): return md5crypt.md5crypt(password, salt, '$1$') def site_is_local(siteid): - site = config.sites[siteid] - return "socket" not in site \ - or site["socket"] == "unix:" + defaults.livestatus_unix_socket + return config.site_is_local(siteid) # Returns the ID of our site. This function only works in replication # mode and looks for an entry connecting to the local socket. diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 09cc393..ddc7a5a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -244,7 +244,7 @@ multisite_icons.append({ def logwatch_url(sitename, notes_url): i = notes_url.index("check_mk/logwatch.py") site = html.site_status[sitename]["site"] - return site["url_prefix"] + notes_url[i:] + return site["url_prefix"] + notes_url[i:] + '&master_url=&' def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options: