[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed exception when logging actions exectuted by mkeventd

Module: check_mk Branch: master Commit: 288e6adb5e01781c004c81ffdfc2f30f0c0a361a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=288e6adb5e0178… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 12:08:21 2013 +0100 FIX: Fixed exception when logging actions exectuted by mkeventd --- ChangeLog | 3 +++ mkeventd/bin/mkeventd | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7d89d1..332ae45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ BI: * FIX: fix exception in BI-Boxes views of host groups + Event Console: + * FIX: Fixed exception when logging actions exectuted by mkeventd + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fa58bff..3c6fcd6 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2296,7 +2296,7 @@ def do_rule_action(action, event, user=""): log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script': execute_script(substitute_event_tags(settings["script"], event)) - log_event_history(event, "SCRIPT", user, action) + log_event_history(event, "SCRIPT", user, action['id']) else: log("Cannot execute action %s: invalid action type %s" % (action["id"], action_type)) except Exception, e: