clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in sysContacts email collection (#15325)

Browse Source 
Also, include trace in log when an error occurs
This commit is contained in:
Tony Murray 2023-09-15 08:05:55 -05:00 committed by GitHub
parent 4b98bd7607
commit ba67d886c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Alert/AlertUtil.php
View File

@ -156,7 +156,7 @@ class AlertUtil
$contacts = [];
foreach ($results as $result) {
$device = DeviceCache::get($result);
$device = DeviceCache::get($result['device_id']);
$email = $device->getAttrib('override_sysContact_bool')
? $device->getAttrib('override_sysContact_string')
: $device->sysContact;

2
LibreNMS/Alert/RunAlerts.php
View File

@ -511,7 +511,7 @@ class RunAlerts
$tmp = $instance->deliverAlert($obj, $item['opts'] ?? []);
$this->alertLog($tmp, $obj, $obj['transport']);
} catch (AlertTransportDeliveryException $e) {
Eventlog::log($e->getMessage(), $obj['device_id'], 'alert', Severity::Error);
Eventlog::log($e->getTraceAsString() . PHP_EOL . $e->getMessage(), $obj['device_id'], 'alert', Severity::Error);
$this->alertLog($e->getMessage(), $obj, $obj['transport']);
} catch (\Exception $e) {
$this->alertLog($e, $obj, $obj['transport']);