mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-26 18:16:24 +01:00
Code Issues Releases Wiki Activity

convert booleans to int since gelf 1.1 only supports string/number (#1973)

Browse Source
This commit is contained in:
Tobias Lorenz
2025-10-23 20:24:05 +02:00
committed by GitHub
parent 2e97231b96
commit f04439c7a4
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ class GelfMessageFormatter extends NormalizerFormatter
foreach ($extra as $key => $val) { foreach ($extra as $key => $val) {
$key = (string) preg_replace('#[^\w.-]#', '-', (string) $key); $key = (string) preg_replace('#[^\w.-]#', '-', (string) $key);
$val = \is_bool($val) ? ($val ? 1 : 0) : $val;
$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) {
@@ -128,6 +129,7 @@ class GelfMessageFormatter extends NormalizerFormatter
foreach ($context as $key => $val) { foreach ($context as $key => $val) {
$key = (string) preg_replace('#[^\w.-]#', '-', (string) $key); $key = (string) preg_replace('#[^\w.-]#', '-', (string) $key);
$val = \is_bool($val) ? ($val ? 1 : 0) : $val;
$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) {

20
tests/Monolog/Formatter/GelfMessageFormatterTest.php
View File

@@ -87,7 +87,7 @@ class GelfMessageFormatterTest extends MonologTestCase
Level::Error, Level::Error,
'log', 'log',
channel: 'meh', channel: 'meh',
context: ['from' => 'logger'], context: ['from' => 'logger', 'trueBool' => true, 'falseBool' => false],
datetime: new \DateTimeImmutable("@0"), datetime: new \DateTimeImmutable("@0"),
extra: ['key' => 'pair'], extra: ['key' => 'pair'],
); );
@@ -100,6 +100,10 @@ class GelfMessageFormatterTest extends MonologTestCase
$this->assertArrayHasKey('_ctxt_from', $message_array); $this->assertArrayHasKey('_ctxt_from', $message_array);
$this->assertEquals('logger', $message_array['_ctxt_from']); $this->assertEquals('logger', $message_array['_ctxt_from']);
$this->assertArrayHasKey('_ctxt_trueBool', $message_array);
$this->assertEquals(1, $message_array['_ctxt_trueBool']);
$this->assertArrayHasKey('_ctxt_falseBool', $message_array);
$this->assertEquals(0, $message_array['_ctxt_falseBool']);
// Test with extraPrefix // Test with extraPrefix
$formatter = new GelfMessageFormatter(null, null, 'CTX'); $formatter = new GelfMessageFormatter(null, null, 'CTX');
@@ -111,6 +115,10 @@ class GelfMessageFormatterTest extends MonologTestCase
$this->assertArrayHasKey('_CTXfrom', $message_array); $this->assertArrayHasKey('_CTXfrom', $message_array);
$this->assertEquals('logger', $message_array['_CTXfrom']); $this->assertEquals('logger', $message_array['_CTXfrom']);
$this->assertArrayHasKey('_CTXtrueBool', $message_array);
$this->assertEquals(1, $message_array['_CTXtrueBool']);
$this->assertArrayHasKey('_CTXfalseBool', $message_array);
$this->assertEquals(0, $message_array['_CTXfalseBool']);
} }
/** /**
@@ -151,7 +159,7 @@ class GelfMessageFormatterTest extends MonologTestCase
channel: 'meh', channel: 'meh',
context: ['from' => 'logger'], context: ['from' => 'logger'],
datetime: new \DateTimeImmutable("@0"), datetime: new \DateTimeImmutable("@0"),
extra: ['key' => 'pair'], extra: ['key' => 'pair', 'trueBool' => true, 'falseBool' => false],
); );
$message = $formatter->format($record); $message = $formatter->format($record);
@@ -162,6 +170,10 @@ class GelfMessageFormatterTest extends MonologTestCase
$this->assertArrayHasKey('_key', $message_array); $this->assertArrayHasKey('_key', $message_array);
$this->assertEquals('pair', $message_array['_key']); $this->assertEquals('pair', $message_array['_key']);
$this->assertArrayHasKey('_trueBool', $message_array);
$this->assertEquals(1, $message_array['_trueBool']);
$this->assertArrayHasKey('_falseBool', $message_array);
$this->assertEquals(0, $message_array['_falseBool']);
// Test with extraPrefix // Test with extraPrefix
$formatter = new GelfMessageFormatter(null, 'EXT'); $formatter = new GelfMessageFormatter(null, 'EXT');
@@ -173,6 +185,10 @@ class GelfMessageFormatterTest extends MonologTestCase
$this->assertArrayHasKey('_EXTkey', $message_array); $this->assertArrayHasKey('_EXTkey', $message_array);
$this->assertEquals('pair', $message_array['_EXTkey']); $this->assertEquals('pair', $message_array['_EXTkey']);
$this->assertArrayHasKey('_EXTtrueBool', $message_array);
$this->assertEquals(1, $message_array['_EXTtrueBool']);
$this->assertArrayHasKey('_EXTfalseBool', $message_array);
$this->assertEquals(0, $message_array['_EXTfalseBool']);
} }
public function testFormatWithLargeData() public function testFormatWithLargeData()