[checkmk-commits] Check_MK Git: check_mk: FIX: EC: fix error message for missing action

Module: check_mk Branch: master Commit: a2f782452c34c9be697f17479c33b987ad2656ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2f782452c34c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:05:25 2013 +0200 FIX: EC: fix error message for missing action --- mkeventd/.f12 | 2 ++ mkeventd/bin/mkeventd | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mkeventd/.f12 b/mkeventd/.f12 index 4e8d41f..8074b44 100644 --- a/mkeventd/.f12 +++ b/mkeventd/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | sort | head -n 1)} OMD_ROOT=/omd/sites/${SITE} diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6887e21..5ce1187 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2125,7 +2125,7 @@ class StatusServer: event = g_event_status.event(int(event_id)) if action_id not in g_config["action"]: raise MKClientError("The action '%s' is not defined. After adding new commands please " - "make sure that you activate the changes in the Event Console.") % action_id + "make sure that you activate the changes in the Event Console." % action_id) action = g_config["action"][action_id] do_rule_action(action, event, user)