mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 19:57:41 +02:00
Code Issues Releases Wiki Activity

Fix gelf formatter keys to strip invalid characters, fixes #1927

Browse Source
This commit is contained in:
Jordi Boggiano
2024-12-05 15:46:00 +01:00
parent a258e4fe90
commit 595847346a
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Monolog/DateTimeImmutable.php
View File

@@ -13,6 +13,7 @@ namespace Monolog;
class_alias(JsonSerializableDateTimeImmutable::class, 'Monolog\DateTimeImmutable'); class_alias(JsonSerializableDateTimeImmutable::class, 'Monolog\DateTimeImmutable');
// @phpstan-ignore-next-line
if (false) { if (false) {
/** /**
* @deprecated Use \Monolog\JsonSerializableDateTimeImmutable instead. * @deprecated Use \Monolog\JsonSerializableDateTimeImmutable instead.

2
src/Monolog/Formatter/GelfMessageFormatter.php
View File

@@ -115,6 +115,7 @@ class GelfMessageFormatter extends NormalizerFormatter
} }
foreach ($extra as $key => $val) { foreach ($extra as $key => $val) {
$key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
$val = \is_scalar($val) || null === $val ? $val : $this->toJson($val); $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
$len = \strlen($this->extraPrefix . $key . $val); $len = \strlen($this->extraPrefix . $key . $val);
if ($len > $this->maxLength) { if ($len > $this->maxLength) {
@@ -126,6 +127,7 @@ class GelfMessageFormatter extends NormalizerFormatter
} }
foreach ($context as $key => $val) { foreach ($context as $key => $val) {
$key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
$val = \is_scalar($val) || null === $val ? $val : $this->toJson($val); $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
$len = \strlen($this->contextPrefix . $key . $val); $len = \strlen($this->contextPrefix . $key . $val);
if ($len > $this->maxLength) { if ($len > $this->maxLength) {