summaryrefslogtreecommitdiffstats
path: root/src/Monolog/Processor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Monolog/Processor')
-rw-r--r--src/Monolog/Processor/GitProcessor.php8
-rw-r--r--src/Monolog/Processor/IntrospectionProcessor.php10
-rw-r--r--src/Monolog/Processor/MemoryPeakUsageProcessor.php6
-rw-r--r--src/Monolog/Processor/MemoryProcessor.php12
-rw-r--r--src/Monolog/Processor/MemoryUsageProcessor.php6
-rw-r--r--src/Monolog/Processor/MercurialProcessor.php60
-rw-r--r--src/Monolog/Processor/ProcessIdProcessor.php6
-rw-r--r--src/Monolog/Processor/PsrLogMessageProcessor.php2
-rw-r--r--src/Monolog/Processor/TagProcessor.php2
-rw-r--r--src/Monolog/Processor/UidProcessor.php8
-rw-r--r--src/Monolog/Processor/WebProcessor.php19
11 files changed, 82 insertions, 57 deletions
diff --git a/src/Monolog/Processor/GitProcessor.php b/src/Monolog/Processor/GitProcessor.php
index cf16be8..9eec186 100644
--- a/src/Monolog/Processor/GitProcessor.php
+++ b/src/Monolog/Processor/GitProcessor.php
@@ -29,11 +29,7 @@ class GitProcessor
$this->level = Logger::toMonologLevel($level);
}
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
// return if the level is not high enough
if ($record['level'] < $this->level) {
@@ -45,7 +41,7 @@ class GitProcessor
return $record;
}
- private static function getGitInfo()
+ private static function getGitInfo(): array
{
if (self::$cache) {
return self::$cache;
diff --git a/src/Monolog/Processor/IntrospectionProcessor.php b/src/Monolog/Processor/IntrospectionProcessor.php
index 59e2f48..e1b5d3a 100644
--- a/src/Monolog/Processor/IntrospectionProcessor.php
+++ b/src/Monolog/Processor/IntrospectionProcessor.php
@@ -37,18 +37,14 @@ class IntrospectionProcessor
'call_user_func_array',
];
- public function __construct($level = Logger::DEBUG, array $skipClassesPartials = [], $skipStackFramesCount = 0)
+ public function __construct($level = Logger::DEBUG, array $skipClassesPartials = [], int $skipStackFramesCount = 0)
{
$this->level = Logger::toMonologLevel($level);
$this->skipClassesPartials = array_merge(['Monolog\\'], $skipClassesPartials);
$this->skipStackFramesCount = $skipStackFramesCount;
}
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
// return if the level is not high enough
if ($record['level'] < $this->level) {
@@ -96,7 +92,7 @@ class IntrospectionProcessor
return $record;
}
- private function isTraceClassOrSkippedFunction(array $trace, $index)
+ private function isTraceClassOrSkippedFunction(array $trace, int $index)
{
if (!isset($trace[$index])) {
return false;
diff --git a/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
index b8fd91c..b6f8acc 100644
--- a/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
@@ -19,11 +19,7 @@ namespace Monolog\Processor;
*/
class MemoryPeakUsageProcessor extends MemoryProcessor
{
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
$bytes = memory_get_peak_usage($this->realUsage);
$formatted = $this->formatBytes($bytes);
diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php
index 460caa6..5b06c2e 100644
--- a/src/Monolog/Processor/MemoryProcessor.php
+++ b/src/Monolog/Processor/MemoryProcessor.php
@@ -32,22 +32,20 @@ abstract class MemoryProcessor
* @param bool $realUsage Set this to true to get the real size of memory allocated from system.
* @param bool $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
*/
- public function __construct($realUsage = true, $useFormatting = true)
+ public function __construct(bool $realUsage = true, bool $useFormatting = true)
{
- $this->realUsage = (boolean) $realUsage;
- $this->useFormatting = (boolean) $useFormatting;
+ $this->realUsage = $realUsage;
+ $this->useFormatting = $useFormatting;
}
/**
* Formats bytes into a human readable string if $this->useFormatting is true, otherwise return $bytes as is
*
* @param int $bytes
- * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as is
+ * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as int
*/
- protected function formatBytes($bytes)
+ protected function formatBytes(int $bytes)
{
- $bytes = (int) $bytes;
-
if (!$this->useFormatting) {
return $bytes;
}
diff --git a/src/Monolog/Processor/MemoryUsageProcessor.php b/src/Monolog/Processor/MemoryUsageProcessor.php
index cb6b2ea..31c9396 100644
--- a/src/Monolog/Processor/MemoryUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryUsageProcessor.php
@@ -19,11 +19,7 @@ namespace Monolog\Processor;
*/
class MemoryUsageProcessor extends MemoryProcessor
{
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
$bytes = memory_get_usage($this->realUsage);
$formatted = $this->formatBytes($bytes);
diff --git a/src/Monolog/Processor/MercurialProcessor.php b/src/Monolog/Processor/MercurialProcessor.php
new file mode 100644
index 0000000..87f254b
--- /dev/null
+++ b/src/Monolog/Processor/MercurialProcessor.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+use Monolog\Logger;
+
+/**
+ * Injects Hg branch and Hg revision number in all records
+ *
+ * @author Jonathan A. Schweder <jonathanschweder@gmail.com>
+ */
+class MercurialProcessor
+{
+ private $level;
+ private static $cache;
+
+ public function __construct($level = Logger::DEBUG)
+ {
+ $this->level = Logger::toMonologLevel($level);
+ }
+
+ public function __invoke(array $record): array
+ {
+ // return if the level is not high enough
+ if ($record['level'] < $this->level) {
+ return $record;
+ }
+
+ $record['extra']['hg'] = self::getMercurialInfo();
+
+ return $record;
+ }
+
+ private static function getMercurialInfo(): array
+ {
+ if (self::$cache) {
+ return self::$cache;
+ }
+
+ $result = explode(' ', trim(`hg id -nb`));
+
+ if (count($result) >= 3) {
+ return self::$cache = [
+ 'branch' => $result[1],
+ 'revision' => $result[2],
+ ];
+ }
+
+ return self::$cache = [];
+ }
+}
diff --git a/src/Monolog/Processor/ProcessIdProcessor.php b/src/Monolog/Processor/ProcessIdProcessor.php
index 7ddafea..392bd13 100644
--- a/src/Monolog/Processor/ProcessIdProcessor.php
+++ b/src/Monolog/Processor/ProcessIdProcessor.php
@@ -18,11 +18,7 @@ namespace Monolog\Processor;
*/
class ProcessIdProcessor
{
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
$record['extra']['process_id'] = getmypid();
diff --git a/src/Monolog/Processor/PsrLogMessageProcessor.php b/src/Monolog/Processor/PsrLogMessageProcessor.php
index e1a42cd..b9a00a4 100644
--- a/src/Monolog/Processor/PsrLogMessageProcessor.php
+++ b/src/Monolog/Processor/PsrLogMessageProcessor.php
@@ -24,7 +24,7 @@ class PsrLogMessageProcessor
* @param array $record
* @return array
*/
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
if (false === strpos($record['message'], '{')) {
return $record;
diff --git a/src/Monolog/Processor/TagProcessor.php b/src/Monolog/Processor/TagProcessor.php
index 19458e2..6371986 100644
--- a/src/Monolog/Processor/TagProcessor.php
+++ b/src/Monolog/Processor/TagProcessor.php
@@ -35,7 +35,7 @@ class TagProcessor
$this->tags = $tags;
}
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
$record['extra']['tags'] = $this->tags;
diff --git a/src/Monolog/Processor/UidProcessor.php b/src/Monolog/Processor/UidProcessor.php
index 891e9df..601171b 100644
--- a/src/Monolog/Processor/UidProcessor.php
+++ b/src/Monolog/Processor/UidProcessor.php
@@ -20,16 +20,16 @@ class UidProcessor
{
private $uid;
- public function __construct($length = 7)
+ public function __construct(int $length = 7)
{
if (!is_int($length) || $length > 32 || $length < 1) {
throw new \InvalidArgumentException('The uid length must be an integer between 1 and 32');
}
- $this->uid = substr(hash('md5', uniqid('', true)), 0, $length);
+ $this->uid = substr(bin2hex(random_bytes((int) ceil($length / 2))), 0, $length);
}
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
$record['extra']['uid'] = $this->uid;
@@ -39,7 +39,7 @@ class UidProcessor
/**
* @return string
*/
- public function getUid()
+ public function getUid(): string
{
return $this->uid;
}
diff --git a/src/Monolog/Processor/WebProcessor.php b/src/Monolog/Processor/WebProcessor.php
index 91abeec..2e7134f 100644
--- a/src/Monolog/Processor/WebProcessor.php
+++ b/src/Monolog/Processor/WebProcessor.php
@@ -65,11 +65,7 @@ class WebProcessor
}
}
- /**
- * @param array $record
- * @return array
- */
- public function __invoke(array $record)
+ public function __invoke(array $record): array
{
// skip processing if for some reason request data
// is not present (CLI or wonky SAPIs)
@@ -82,23 +78,14 @@ class WebProcessor
return $record;
}
- /**
- * @param string $extraName
- * @param string $serverName
- * @return $this
- */
- public function addExtraField($extraName, $serverName)
+ public function addExtraField(string $extraName, string $serverName): self
{
$this->extraFields[$extraName] = $serverName;
return $this;
}
- /**
- * @param array $extra
- * @return array
- */
- private function appendExtraFields(array $extra)
+ private function appendExtraFields(array $extra): array
{
foreach ($this->extraFields as $extraName => $serverName) {
$extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null;
generated by cgit v1.1 at 2025-06-06 01:03:24 +0000