[checkmk-commits] Check_MK Git: check_mk: mknotifyd: Not enforcing notification method during forwarding - the master site chooses the notification method

Module: check_mk Branch: master Commit: fb83c80697043f492bc031e25ff8f1fcc6f3b5bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb83c80697043f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 11:38:23 2013 +0100 mknotifyd: Not enforcing notification method during forwarding - the master site chooses the notification method --- modules/notify.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index cb52b67..19512fb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -224,11 +224,7 @@ def handle_spoolfile(spoolfile): data = eval(file(spoolfile).read()) if not "context" in data.keys(): return 2 - # if data["plugin"] == None: - # plugin = 'email' - # else: - # plugin = data['plugin'] - return process_context(data["context"], False, data.get("plugin", "email")) + return process_context(data["context"], False) except Exception, e: notify_log("ERROR %s\n%s" % (e, format_exception())) return 2