viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logger exceptions changes

Browse Source
This commit is contained in:
Yurii
2026-05-14 17:55:36 +03:00
parent eda4b5842b
commit 5d632726ec
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Espo/Core/Job/JobRunner.php
View File

@@ -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,

17
application/Espo/Core/Log/DefaultFormatter.php
View File

@@ -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()}";