[checkmk-commits] EC: Use livestatus.LocalConnection() instead of livestatus_query for notifications check

Module: check_mk Branch: master Commit: f116d03d3f5eee5e6d308461dba024e734b0b96b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f116d03d3f5eee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 11:49:12 2016 +0100 EC: Use livestatus.LocalConnection() instead of livestatus_query for notifications check Change-Id: Ic7bd4703b80289020e566185bf031a54471a2320 --- bin/mkeventd | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index cbc04fb..3fff2e2 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -39,6 +39,7 @@ import traceback from cmk.regex import regex, is_regex import cmk.defines as defines import cmk.daemon +import livestatus try: import simplejson as json @@ -4037,15 +4038,12 @@ def add_rbn_contact_information(context, host, contact_groups, contact_groups_no def core_has_notifications_disabled(event): try: - answer = livestatus_query("GET status\nColumns: enable_notifications\nOutputFormat: python\n") - if answer: - notifications_enabled = eval(answer) - if not notifications_enabled[0][0]: - log("Notifications are currently disabled. Skipped notification for event %d" % event["id"]) - return True - except: - # On any error, assume that notifications are enabled - pass + notifications_enabled = livestatus.LocalConnection().query_value("GET status\nColumns: enable_notifications") + if not notifications_enabled: + log("Notifications are currently disabled. Skipped notification for event %d" % event["id"]) + return True + except Exception, e: + log("Cannot determine wether notifcations are enabled in core: %s. Assuming YES." % e) return False