Fix enotice when Log service is swapped out

This function is calling a property on the psr_log service that may not exist. If the
service is swapped out there is no reason the replacement should have this property.

diff --git a/CRM/Core/Error/Log.php b/CRM/Core/Error/Log.php
index de619aaee050d521b8abc614ef026aab667fb110..9904045ad1a169f5c3ed3981e44a41ba13f52c73 100644 (file)
--- a/CRM/Core/Error/Log.php
+++ b/CRM/Core/Error/Log.php
@@ -26,7 +26,14 @@ class CRM_Core_Error_Log extends \Psr\Log\AbstractLogger {
    * CRM_Core_Error_Log constructor.
    */
   public function __construct() {
-    $this->map = [
+    $this->map = self::getMap();
+  }
+
+  /**
+   * @return array
+   */
+  public static function getMap():array {
+    return [
       \Psr\Log\LogLevel::DEBUG => PEAR_LOG_DEBUG,
       \Psr\Log\LogLevel::INFO => PEAR_LOG_INFO,
       \Psr\Log\LogLevel::NOTICE => PEAR_LOG_NOTICE,

diff --git a/Civi/API/LogObserver.php b/Civi/API/LogObserver.php
index b92eaa67d4048faded898571d7345db537688fce..c7cf5a32361d066d6b75889782c126536cb8c0ae 100644 (file)
--- a/Civi/API/LogObserver.php
+++ b/Civi/API/LogObserver.php
@@ -23,7 +23,7 @@ class LogObserver extends \Log_observer {
    * @param array $event
    */
   public function notify($event) {
-    $levels = \Civi::log()->map;
+    $levels = \CRM_Core_Error_Log::getMap();
     $event['level'] = array_search($event['priority'], $levels);
     // Extract [civi.tag] from message string
     // As noted in \CRM_Core_Error_Log::log() the $context array gets prematurely converted to string with print_r() so we have to un-flatten it here