Skip to content

EspoCRM – Open Source CRM Application

Logger exceptions changes

Yurii5d632726ec94
diff --git a/application/Espo/Core/Job/JobRunner.php b/application/Espo/Core/Job/JobRunner.php
index 9d604b1c7c..a394cad5f7 100644
--- a/application/Espo/Core/Job/JobRunner.php
+++ b/application/Espo/Core/Job/JobRunner.php
@@ -131,7 +131,7 @@ class JobRunner
$jobId = $jobEntity->hasId() ? $jobEntity->getId() : null;
- $this->log->critical("Failed job {id}. {message}", [
+ $this->log->critical("Failed job {id}.", [
'exception' => $e,
'message' => $e->getMessage(),
Attribute::ID => $jobId,
diff --git a/application/Espo/Core/Log/DefaultFormatter.php b/application/Espo/Core/Log/DefaultFormatter.php
index 5746af3b52..bc3b1690ad 100644
--- a/application/Espo/Core/Log/DefaultFormatter.php
+++ b/application/Espo/Core/Log/DefaultFormatter.php
@@ -30,14 +30,13 @@
namespace Espo\Core\Log;
use Espo\Core\Api\Request;
-use Espo\Core\Exceptions\HasBody;
use Monolog\Formatter\LineFormatter;
use Monolog\LogRecord;
use Throwable;
class DefaultFormatter extends LineFormatter
{
- private const string LINE_FORMAT = "[%datetime%] %level_name%: %code% %message% %request% %exception%\n";
+ private const string LINE_FORMAT = "[%datetime%] %level_name%: %code% %message% %request%\n";
private const string DATE_FORMAT = 'Y-m-d H:i:s';
public function __construct(
@@ -84,18 +83,6 @@ class DefaultFormatter extends LineFormatter
return str_replace('%exception%', '', $line);
}
- if (!$exception instanceof HasBody || !$exception->getBody()) {
- $part = ":: {$exception->getFile()}({$exception->getLine()})";
-
- $line = str_replace('%exception%', $part, $line);
- } else {
- $line = str_replace('%exception%', '', $line);
- }
-
- if (!$this->includeTraces) {
- return $line;
- }
-
$line .= $this->normalizeException($exception);
return $line;
@@ -106,7 +93,7 @@ class DefaultFormatter extends LineFormatter
$request = $record->context['request'] ?? null;
if (!$request instanceof Request) {
- return str_replace('%request% ', '', $line);
+ return str_replace('%request%', '', $line);
}
$requestPart = ":: {$request->getMethod()} {$request->getResourcePath()}";