fixed backtrace in search_api_solr_log

mkalkbrenner · Jan 27, 2025 · 4306e7f · 4306e7f
1 parent c682e44
commit 4306e7f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/modules/search_api_solr_log/src/Logger/SolrLogger.php b/modules/search_api_solr_log/src/Logger/SolrLogger.php
@@ -74,7 +74,7 @@ public function log($level, string|\Stringable $message, array $context = []): v
     }
     // Remove backtrace and exception since they may contain
     // an unserializable variable.
-    unset($context['exception']);
+    unset($context['backtrace'], $context['exception']);
     try {
       $connector = self::getConnector();
     } catch (SearchApiException $e) {

diff --git a/modules/search_api_solr_log/src/Plugin/views/field/LogMessage.php b/modules/search_api_solr_log/src/Plugin/views/field/LogMessage.php
@@ -63,10 +63,18 @@ public function render(ResultRow $values): string {
       $variables_json = $values->{'solr_document/zs_variables'}[0] ?? '{}';
       $variables = json_decode($variables_json, TRUE);
 
+      if ($variables === NULL) {
+        return Xss::filterAdmin($value);
+      }
+
+      // Ensure backtrace strings are properly formatted.
       if (isset($variables['@backtrace_string'])) {
         $variables['@backtrace_string'] = new FormattableMarkup(
           '<pre class="backtrace">@backtrace_string</pre>', $variables
         );
+        if (!str_contains($value, '@backtrace_string')) {
+          $value .= ' @backtrace_string';
+        }
       }
 
       return $this->t(Xss::filterAdmin($value), (array) $variables)->render();