[checkmk-commits] Check_MK Git: check_mk: livestatus: enable_environment_macros == 1 creates a warning logentry on nagios startup

Module: check_mk Branch: master Commit: 51bb2ab8a49919da250bfff83e5fb6e3e38aa0fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51bb2ab8a49919… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 16:18:07 2012 +0200 livestatus: enable_environment_macros == 1 creates a warning logentry on nagios startup --- livestatus/src/module.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 1100c47..dcb25b7 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -67,6 +67,7 @@ NEB_API_VERSION(CURRENT_NEB_API_VERSION) extern int event_broker_options; +extern int enable_environment_macros; extern char *log_file; int g_idle_timeout_msec = 300 * 1000; /* maximum idle time for connection in keep alive state */ @@ -572,7 +573,6 @@ int verify_event_broker_options() return errors == 0; } - void register_callbacks() { neb_register_callback(NEBCALLBACK_HOST_STATUS_DATA, g_nagios_handle, 0, broker_host); // Needed to start threads @@ -798,6 +798,9 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han else if (g_debug_level > 0) logger(LG_INFO, "Your event_broker_options are sufficient for livestatus.."); + if (enable_environment_macros == 1) + logger(LG_INFO, "Warning: environment_macros are enabled"); + store_init(); register_callbacks();