Module: check_mk Branch: master Commit: 4f36d64822a445523643d3fbf295f61ee7758234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f36d64822a445… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 17:20:06 2015 +0200 Fix exception in WATO when activating changes while an error occurs --- modules/automation.py | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 9051ed5..4349118 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -455,6 +455,7 @@ def automation_delete_host(args): os.system("rm -rf '%s'" % path) def automation_restart(job = "restart", use_rushd = True): + # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if # check_mk is called by WATO via Apache. Nagios inherits diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5c32900..127efb3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11739,7 +11739,7 @@ def ajax_replication(): # Pre 1.2.7i3 sites return True on success and a string on error. # 1.2.7i3 and later return a ist of warning messages on success. # [] means OK and no warnings. The error handling is unchanged - if result == True: + if result == True or result == None: result = [] if type(result) == list: