From: Philipp Holzer <admin@philipp.info>
Date: Mon, 28 Jan 2019 17:41:29 +0000 (+0100)
Subject: Making the processor name more explicit
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d7e35b5802cdb66241778de82bb1061417008cf0;p=friendica.git
Making the processor name more explicit
---
diff --git a/src/Util/Logger/FriendicaIntrospectionProcessor.php b/src/Util/Logger/FriendicaIntrospectionProcessor.php
new file mode 100644
index 0000000000..aa3933a215
--- /dev/null
+++ b/src/Util/Logger/FriendicaIntrospectionProcessor.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Friendica\Util\Logger;
+
+use Monolog\Logger;
+use Monolog\Processor\ProcessorInterface;
+
+/**
+ * Injects line/file//function where the log message came from
+ *
+ * Based on the class IntrospectionProcessor without the "class" information
+ * @see IntrospectionProcessor
+ */
+class FriendicaIntrospectionProcessor implements ProcessorInterface
+{
+ private $level;
+
+ private $skipStackFramesCount;
+
+ private $skipClassesPartials;
+
+ private $skipFunctions = [
+ 'call_user_func',
+ 'call_user_func_array',
+ ];
+
+ /**
+ * @param string|int $level The minimum logging level at which this Processor will be triggered
+ * @param array $skipClassesPartials An array of classes to skip during logging
+ * @param int $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
+ */
+ public function __construct($level = Logger::DEBUG, $skipClassesPartials = array(), $skipStackFramesCount = 0)
+ {
+ $this->level = Logger::toMonologLevel($level);
+ $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials);
+ $this->skipStackFramesCount = $skipStackFramesCount;
+ }
+
+ public function __invoke(array $record)
+ {
+ // return if the level is not high enough
+ if ($record['level'] < $this->level) {
+ return $record;
+ }
+
+ $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+ $i = 1;
+
+ while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
+ $i++;
+ }
+
+ $i += $this->skipStackFramesCount;
+
+ // we should have the call source now
+ $record['extra'] = array_merge(
+ $record['extra'],
+ [
+ 'file' => isset($trace[$i - 1]['file']) ? basename($trace[$i - 1]['file']) : null,
+ 'line' => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
+ 'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
+ ]
+ );
+
+ return $record;
+ }
+
+ /**
+ * Checks if the current trace class or function has to be skipped
+ *
+ * @param array $trace The current trace array
+ * @param int $index The index of the current hierarchy level
+ * @return bool True if the class or function should get skipped, otherwise false
+ */
+ private function isTraceClassOrSkippedFunction(array $trace, $index)
+ {
+ if (!isset($trace[$index])) {
+ return false;
+ }
+
+ if (isset($trace[$index]['class'])) {
+ foreach ($this->skipClassesPartials as $part) {
+ if (strpos($trace[$index]['class'], $part) !== false) {
+ return true;
+ }
+ }
+ } elseif (in_array($trace[$index]['function'], $this->skipFunctions)) {
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/src/Util/Logger/FriendicaProcessor.php b/src/Util/Logger/FriendicaProcessor.php
deleted file mode 100644
index 9f52a6f126..0000000000
--- a/src/Util/Logger/FriendicaProcessor.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Friendica\Util\Logger;
-
-use Monolog\Logger;
-use Monolog\Processor\ProcessorInterface;
-
-/**
- * Injects line/file//function where the log message came from
- *
- * Based on the class IntrospectionProcessor without the "class" information
- * @see IntrospectionProcessor
- */
-class FriendicaProcessor implements ProcessorInterface
-{
- private $level;
-
- private $skipStackFramesCount;
-
- private $skipClassesPartials;
-
- private $skipFunctions = [
- 'call_user_func',
- 'call_user_func_array',
- ];
-
- /**
- * @param string|int $level The minimum logging level at which this Processor will be triggered
- * @param array $skipClassesPartials An array of classes to skip during logging
- * @param int $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
- */
- public function __construct($level = Logger::DEBUG, $skipClassesPartials = array(), $skipStackFramesCount = 0)
- {
- $this->level = Logger::toMonologLevel($level);
- $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials);
- $this->skipStackFramesCount = $skipStackFramesCount;
- }
-
- public function __invoke(array $record)
- {
- // return if the level is not high enough
- if ($record['level'] < $this->level) {
- return $record;
- }
-
- $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-
- $i = 1;
-
- while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
- $i++;
- }
-
- $i += $this->skipStackFramesCount;
-
- // we should have the call source now
- $record['extra'] = array_merge(
- $record['extra'],
- [
- 'file' => isset($trace[$i - 1]['file']) ? basename($trace[$i - 1]['file']) : null,
- 'line' => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
- 'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
- ]
- );
-
- return $record;
- }
-
- /**
- * Checks if the current trace class or function has to be skipped
- *
- * @param array $trace The current trace array
- * @param int $index The index of the current hierarchy level
- * @return bool True if the class or function should get skipped, otherwise false
- */
- private function isTraceClassOrSkippedFunction(array $trace, $index)
- {
- if (!isset($trace[$index])) {
- return false;
- }
-
- if (isset($trace[$index]['class'])) {
- foreach ($this->skipClassesPartials as $part) {
- if (strpos($trace[$index]['class'], $part) !== false) {
- return true;
- }
- }
- } elseif (in_array($trace[$index]['function'], $this->skipFunctions)) {
- return true;
- }
-
- return false;
- }
-}
diff --git a/src/Util/LoggerFactory.php b/src/Util/LoggerFactory.php
index 961585ebfe..4d3a287165 100644
--- a/src/Util/LoggerFactory.php
+++ b/src/Util/LoggerFactory.php
@@ -4,7 +4,7 @@ namespace Friendica\Util;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\Logger\FriendicaDevelopHandler;
-use Friendica\Util\Logger\FriendicaProcessor;
+use Friendica\Util\Logger\FriendicaIntrospectionProcessor;
use Monolog;
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
@@ -29,7 +29,7 @@ class LoggerFactory
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\UidProcessor());
- $logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
+ $logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
return $logger;
}
@@ -53,7 +53,7 @@ class LoggerFactory
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\UidProcessor());
- $logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
+ $logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
$logger->pushHandler(new FriendicaDevelopHandler($developerIp));