From: mark burdett <mfburdett@gmail.com>
Date: Thu, 8 Aug 2019 21:28:13 +0000 (-0700)
Subject: Revert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9726c118a180065a2789e223e74573b0f166851f;p=civicrm-core.git

Revert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods could use Civi::log() internally; prefix param support for Civi::log()."

Due to regression https://lab.civicrm.org/dev/core/issues/1174

This reverts commit 3ac984a463d71d796096d5c78c4abd2de0d0a27d.
---

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 8166498fc6..16ac8caf4d 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -39,8 +39,6 @@ require_once 'CRM/Core/Exception.php';
 
 require_once 'Log.php';
 
-use Psr\Log\LogLevel;
-
 /**
  * Class CRM_Exception
  */
@@ -234,7 +232,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     $errorDetails = CRM_Core_Error::debug('', $error, FALSE);
     $template->assign_by_ref('errorDetails', $errorDetails);
 
-    CRM_Core_Error::debug_var('Fatal Error Details', $error, TRUE, TRUE, '', LogLevel::ERROR);
+    CRM_Core_Error::debug_var('Fatal Error Details', $error);
     CRM_Core_Error::backtrace('backTrace', TRUE);
 
     if ($config->initialized) {
@@ -341,7 +339,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
 
     if (self::$modeException) {
       // CRM-11043
-      CRM_Core_Error::debug_var('Fatal Error Details', $vars, TRUE, TRUE, '', LogLevel::ERROR);
+      CRM_Core_Error::debug_var('Fatal Error Details', $vars);
       CRM_Core_Error::backtrace('backTrace', TRUE);
 
       $details = 'A fatal error was triggered';
@@ -383,7 +381,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
       self::backtrace();
     }
 
-    CRM_Core_Error::debug_var('Fatal Error Details', $vars, TRUE, TRUE, '', LogLevel::ERROR);
+    CRM_Core_Error::debug_var('Fatal Error Details', $vars);
     CRM_Core_Error::backtrace('backTrace', TRUE);
 
     // If we are in an ajax callback, format output appropriately
@@ -423,7 +421,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     }
     catch (Exception $other) {
       // if the exception-handler generates an exception, then that sucks! oh, well. carry on.
-      CRM_Core_Error::debug_var('handleUnhandledException_nestedException', self::formatTextException($other), TRUE, TRUE, '', LogLevel::ERROR);
+      CRM_Core_Error::debug_var('handleUnhandledException_nestedException', self::formatTextException($other));
     }
     $config = CRM_Core_Config::singleton();
     $vars = [
@@ -461,7 +459,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     // Case C: Default error handler
 
     // log to file
-    CRM_Core_Error::debug_var('Fatal Error Details', $vars, FALSE, TRUE, '', LogLevel::ERROR);
+    CRM_Core_Error::debug_var('Fatal Error Details', $vars, FALSE);
     CRM_Core_Error::backtrace('backTrace', TRUE);
 
     // print to screen
@@ -546,8 +544,6 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    *   Log or return the output?
    * @param string $prefix
    *   Prefix for output logfile.
-   * @param string $level
-   *   The PSR-3 log level.
    *
    * @return string
    *   The generated output
@@ -555,7 +551,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    * @see CRM_Core_Error::debug()
    * @see CRM_Core_Error::debug_log_message()
    */
-  public static function debug_var($variable_name, $variable, $print = TRUE, $log = TRUE, $prefix = '', $level = LogLevel::INFO) {
+  public static function debug_var($variable_name, $variable, $print = TRUE, $log = TRUE, $prefix = '') {
     // check if variable is set
     if (!isset($variable)) {
       $out = "\$$variable_name is not set";
@@ -578,15 +574,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
         reset($variable);
       }
     }
-    Civi::log()->log($level, $out, ['civi.prefix' => $prefix]);
-    return self::debugOutput($out);
-  }
-
-  /**
-   * Generates debug HTML output.
-   */
-  public static function debugOutput($message) {
-    return '<p/><code>' . htmlspecialchars($message) . '</code>';
+    return self::debug_log_message($out, FALSE, $prefix);
   }
 
   /**
@@ -612,7 +600,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     $file_log = self::createDebugLogger($prefix);
     $file_log->log("$message\n", $priority);
 
-    $str = self::debugOutput($message);
+    $str = '<p/><code>' . htmlspecialchars($message) . '</code>';
     if ($out && CRM_Core_Permission::check('view debug output')) {
       echo $str;
     }
@@ -647,7 +635,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
         CRM_Core_Error::backtrace($string, TRUE);
       }
       elseif (CIVICRM_DEBUG_LOG_QUERY) {
-        CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log', LogLevel::DEBUG);
+        CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log');
       }
     }
   }
@@ -659,7 +647,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    */
   public static function debug_query_result($query) {
     $results = CRM_Core_DAO::executeQuery($query)->fetchAll();
-    CRM_Core_Error::debug_var('dao result', ['query' => $query, 'results' => $results], TRUE, TRUE, '', LogLevel::DEBUG);
+    CRM_Core_Error::debug_var('dao result', ['query' => $query, 'results' => $results]);
   }
 
   /**
@@ -743,7 +731,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
       CRM_Core_Error::debug($msg, $message);
     }
     else {
-      CRM_Core_Error::debug_var($msg, $message, TRUE, TRUE, '', LogLevel::DEBUG);
+      CRM_Core_Error::debug_var($msg, $message);
     }
   }
 
@@ -960,7 +948,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    * @throws PEAR_Exception
    */
   public static function exceptionHandler($pearError) {
-    CRM_Core_Error::debug_var('Fatal Error Details', self::getErrorDetails($pearError), TRUE, TRUE, '', LogLevel::ERROR);
+    CRM_Core_Error::debug_var('Fatal Error Details', self::getErrorDetails($pearError));
     CRM_Core_Error::backtrace('backTrace', TRUE);
     throw new PEAR_Exception($pearError->getMessage(), $pearError);
   }
@@ -974,7 +962,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    *   $obj
    */
   public static function nullHandler($obj) {
-    Civi::log()->error("Ignoring exception thrown by nullHandler: {$obj->code}, {$obj->message}");
+    CRM_Core_Error::debug_log_message("Ignoring exception thrown by nullHandler: {$obj->code}, {$obj->message}");
     CRM_Core_Error::backtrace('backTrace', TRUE);
     return $obj;
   }
diff --git a/CRM/Core/Error/Log.php b/CRM/Core/Error/Log.php
index 503a576de6..fc31c16223 100644
--- a/CRM/Core/Error/Log.php
+++ b/CRM/Core/Error/Log.php
@@ -59,7 +59,6 @@ class CRM_Core_Error_Log extends \Psr\Log\AbstractLogger {
   public function log($level, $message, array $context = []) {
     // FIXME: This flattens a $context a bit prematurely. When integrating
     // with external/CMS logs, we should pass through $context.
-    $prefix = '';
     if (!empty($context)) {
       if (isset($context['exception'])) {
         $context['exception'] = CRM_Core_Error::formatTextException($context['exception']);
@@ -69,11 +68,8 @@ class CRM_Core_Error_Log extends \Psr\Log\AbstractLogger {
       if (CRM_Utils_System::isDevelopment() && CRM_Utils_Array::value('civi.tag', $context) === 'deprecated') {
         trigger_error($message, E_USER_DEPRECATED);
       }
-      if (isset($context['civi.prefix'])) {
-        $prefix = $context['civi.prefix'];
-      }
     }
-    CRM_Core_Error::debug_log_message($message, FALSE, $prefix, $this->map[$level]);
+    CRM_Core_Error::debug_log_message($message, FALSE, '', $this->map[$level]);
   }
 
 }