mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 09:36:11 +02:00
Code Issues Releases Wiki Activity

Add LogRecord class, drop PHP <8.1

Browse Source
This commit is contained in:
Jordi Boggiano
2022-02-20 14:39:51 +01:00
parent f2f66cd480
commit 22c8b19358
111 changed files with 501 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Monolog/Processor/GitProcessor.php
View File

@@ -13,6 +13,7 @@ namespace Monolog\Processor;
use Monolog\Logger;
use Psr\Log\LogLevel;
use Monolog\LogRecord;
/**
* Injects Git branch and Git commit SHA in all records
@@ -43,7 +44,7 @@ class GitProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
// return if the level is not high enough
if ($record['level'] < $this->level) {

4
src/Monolog/Processor/HostnameProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Injects value of gethostname in all records
*/
@@ -27,7 +29,7 @@ class HostnameProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$record['extra']['hostname'] = self::$host;

3
src/Monolog/Processor/IntrospectionProcessor.php
View File

@@ -13,6 +13,7 @@ namespace Monolog\Processor;
use Monolog\Logger;
use Psr\Log\LogLevel;
use Monolog\LogRecord;
/**
* Injects line/file:class/function where the log message came from
@@ -58,7 +59,7 @@ class IntrospectionProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
// return if the level is not high enough
if ($record['level'] < $this->level) {

4
src/Monolog/Processor/MemoryPeakUsageProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Injects memory_get_peak_usage in all records
*
@@ -22,7 +24,7 @@ class MemoryPeakUsageProcessor extends MemoryProcessor
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$usage = memory_get_peak_usage($this->realUsage);

4
src/Monolog/Processor/MemoryUsageProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Injects memory_get_usage in all records
*
@@ -22,7 +24,7 @@ class MemoryUsageProcessor extends MemoryProcessor
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$usage = memory_get_usage($this->realUsage);

3
src/Monolog/Processor/MercurialProcessor.php
View File

@@ -13,6 +13,7 @@ namespace Monolog\Processor;
use Monolog\Logger;
use Psr\Log\LogLevel;
use Monolog\LogRecord;
/**
* Injects Hg branch and Hg revision number in all records
@@ -42,7 +43,7 @@ class MercurialProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
// return if the level is not high enough
if ($record['level'] < $this->level) {

4
src/Monolog/Processor/ProcessIdProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Adds value of getmypid into records
*
@@ -21,7 +23,7 @@ class ProcessIdProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$record['extra']['process_id'] = getmypid();

11
src/Monolog/Processor/ProcessorInterface.php
View File

@@ -11,20 +11,17 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* An optional interface to allow labelling Monolog processors.
*
* @author Nicolas Grekas <p@tchwork.com>
*
* @phpstan-import-type Record from \Monolog\Logger
*/
interface ProcessorInterface
{
/**
* @return array The processed record
*
* @phpstan-param Record $record
* @phpstan-return Record
* @return LogRecord The processed record
*/
public function __invoke(array $record);
public function __invoke(LogRecord $record);
}

13
src/Monolog/Processor/PsrLogMessageProcessor.php
View File

@@ -12,6 +12,7 @@
namespace Monolog\Processor;
use Monolog\Utils;
use Monolog\LogRecord;
/**
* Processes a record's message according to PSR-3 rules
@@ -43,14 +44,16 @@ class PsrLogMessageProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
if (false === strpos($record['message'], '{')) {
return $record;
}
$replacements = [];
foreach ($record['context'] as $key => $val) {
$context = $record['context'];
foreach ($context as $key => $val) {
$placeholder = '{' . $key . '}';
if (strpos($record['message'], $placeholder) === false) {
continue;
@@ -75,12 +78,10 @@ class PsrLogMessageProcessor implements ProcessorInterface
}
if ($this->removeUsedContextFields) {
unset($record['context'][$key]);
unset($context[$key]);
}
}
$record['message'] = strtr($record['message'], $replacements);
return $record;
return $record->with(message: strtr($record['message'], $replacements), context: $context);
}
}

6
src/Monolog/Processor/TagProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Adds a tags array into record
*
@@ -52,9 +54,9 @@ class TagProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$record['extra']['tags'] = $this->tags;
$record->extra['tags'] = $this->tags;
return $record;
}

3
src/Monolog/Processor/UidProcessor.php
View File

@@ -12,6 +12,7 @@
namespace Monolog\Processor;
use Monolog\ResettableInterface;
use Monolog\LogRecord;
/**
* Adds a unique identifier into records
@@ -35,7 +36,7 @@ class UidProcessor implements ProcessorInterface, ResettableInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
$record['extra']['uid'] = $this->uid;

4
src/Monolog/Processor/WebProcessor.php
View File

@@ -11,6 +11,8 @@
namespace Monolog\Processor;
use Monolog\LogRecord;
/**
* Injects url/method and remote IP of the current web request in all records
*
@@ -76,7 +78,7 @@ class WebProcessor implements ProcessorInterface
/**
* {@inheritDoc}
*/
public function __invoke(array $record): array
public function __invoke(LogRecord $record): LogRecord
{
// skip processing if for some reason request data
// is not present (CLI or wonky SAPIs)