mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Catch failed transports that don't return 'false'. Pass error message into event log.

Browse Source
This commit is contained in:
Robert Gornall
2016-03-23 16:50:16 +00:00
parent 75e1712f74
commit 59ad5d06c4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
alerts.php
View File

@@ -345,14 +345,18 @@ function ExtTransports($obj) {
$prefix = array( 0=>"recovery", 1=>$obj['severity']." alert", 2=>"acknowledgment" ); $prefix = array( 0=>"recovery", 1=>$obj['severity']." alert", 2=>"acknowledgment" );
$prefix[3] = &$prefix[0]; $prefix[3] = &$prefix[0];
$prefix[4] = &$prefix[0]; $prefix[4] = &$prefix[0];
if ($tmp) { if ($tmp === true) {
echo 'OK'; echo 'OK';
log_event('Issued '.$prefix[$obj['state']]." 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 { elseif ($tmp === false) {
echo 'ERROR'; echo 'ERROR';
log_event('Could not issue '.$prefix[$obj['state']]." 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']);
} }
else {
echo 'ERROR: '.$tmp."\r\n";
log_event('Could not issue '.$prefix[$obj['state']]." for rule '".$obj['name']."' to transport '".$transport."' Error: ".$tmp, $obj['device_id']);
}
} }
echo '; '; echo '; ';