[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: notifications: clear host and service macros after a notification happened

git at icinga.org git at icinga.org
Tue Aug 7 19:32:30 CEST 2012


Module: icinga-core
Branch: mfriedrich/core
Commit: 3661d9cd38fdbafd9c31398f1dfaba32f8ebd51a
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3661d9cd38fdbafd9c31398f1dfaba32f8ebd51a

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Aug  7 19:30:14 2012 +0200

notifications: clear host and service macros after a notification happened

---

 base/notifications.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/base/notifications.c b/base/notifications.c
index d1c73fa..d78b7b6 100644
--- a/base/notifications.c
+++ b/base/notifications.c
@@ -288,6 +288,8 @@ int service_notification(service *svc, int type, char *not_author, char *not_dat
                 clear_summary_macros_r(&mac);
                 clear_contact_macros_r(&mac);
                 clear_argv_macros_r(&mac);
+		clear_service_macros_r(&mac);
+		clear_host_macros_r(&mac);
 
                 /* this gets set in create_notification_list_from_service() */
                 my_free(mac.x[MACRO_NOTIFICATIONISESCALATED]);
@@ -1455,6 +1457,7 @@ int host_notification(host *hst, int type, char *not_author, char *not_data, int
 		clear_summary_macros_r(&mac);
 		clear_contact_macros_r(&mac);
 		clear_argv_macros_r(&mac);
+		clear_host_macros_r(&mac);
 
 		/* this gets set in create_notification_list_from_service() */
 		my_free(mac.x[MACRO_NOTIFICATIONISESCALATED]);





More information about the icinga-checkins mailing list