Fix bug in sysContacts email collection

Also, include trace in log when an error occurs
murrant · Sep 15, 2023 · f507ac6 · f507ac6
1 parent 7bbe0a2
commit f507ac6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LibreNMS/Alert/AlertUtil.php b/LibreNMS/Alert/AlertUtil.php
@@ -156,7 +156,7 @@ public static function findContactsSysContact(array $results): array
         $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;

diff --git a/LibreNMS/Alert/RunAlerts.php b/LibreNMS/Alert/RunAlerts.php
@@ -511,7 +511,7 @@ public function extTransports($obj)
                     $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']);