[checkmk-commits] Fixed invalid function calls after refactoring

Module: check_mk Branch: master Commit: 6457bb0301b8ce2bc44d4c1d408252a077bc131a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6457bb0301b8ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:56:01 2016 +0100 Fixed invalid function calls after refactoring --- web/htdocs/userdb.py | 2 +- web/htdocs/watolib.py | 2 +- web/plugins/sidebar/wato.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index dc6f156..fb69347 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1033,7 +1033,7 @@ def userdb_sync_job_enabled(): return False # not enabled at all import wato # FIXME: Cleanup! - if cfg == "master" and wato.is_slave_site(): + if cfg == "master" and wato.is_wato_slave_site(): return False return True diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5467a66..94e35d5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -209,7 +209,7 @@ def log_pending(status, linkinfo, what, message, user_id = None): # The latter one condition applies to slave sites # Otherwise slave sites would trigger the cmcrushd - if not is_distributed() and not is_slave_site(): + if not is_distributed() and not is_wato_slave_site(): if status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) cmc_rush_ahead() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index e857769..ccc34ce 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -219,8 +219,7 @@ def sort_by_title(folders): def render_wato_foldertree(): - is_slave_site = not wato.is_distributed() and os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk") - if not is_slave_site: + if not wato.is_wato_slave_site(): if not config.wato_enabled: html.write(_("WATO is disabled.")) return False