From ec6dc0fb405cf9e94950ed87182fda38b7c83849 Mon Sep 17 00:00:00 2001 From: f0o Date: Thu, 13 Aug 2015 20:36:34 +0000 Subject: [PATCH] Reformated eventlog messages to represent the state of the trigger --- alerts.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alerts.php b/alerts.php index 8fd4e53611..fafc909ac1 100755 --- a/alerts.php +++ b/alerts.php @@ -328,13 +328,16 @@ function ExtTransports($obj) { echo $transport.' => '; eval('$tmp = function($obj,$opts) { global $config; '.file_get_contents($config['install_dir'].'/includes/alerts/transport.'.$transport.'.php').' };'); $tmp = $tmp($obj,$opts); + $prefix = array( 0=>"recovery", 1=>$obj['severity']." alert", 2=>"acknowledgment" ); + $prefix[3] = &$prefix[0]; + $prefix[4] = &$prefix[0]; if ($tmp) { echo 'OK'; - log_event('Issued '.$obj['severity']." alert for rule '".$obj['name']."' to transport '".$transport."'", $obj['device_id']); + log_event('Issued '.$prefix[$obj['state']]." for rule '".$obj['name']."' to transport '".$transport."'", $obj['device_id']); } else { echo 'ERROR'; - log_event('Could not issue '.$obj['severity']." alert for rule '".$obj['name']."' to transport '".$transport."'", $obj['device_id']); + log_event('Could not issue '.$prefix[$obj['state']]." for rule '".$obj['name']."' to transport '".$transport."'", $obj['device_id']); } }