]> git.mxchange.org Git - friendica.git/commitdiff
Making the processor name more explicit
authorPhilipp Holzer <admin@philipp.info>
Mon, 28 Jan 2019 17:41:29 +0000 (18:41 +0100)
committerPhilipp Holzer <admin@philipp.info>
Mon, 28 Jan 2019 17:41:29 +0000 (18:41 +0100)
src/Util/Logger/FriendicaIntrospectionProcessor.php [new file with mode: 0644]
src/Util/Logger/FriendicaProcessor.php [deleted file]
src/Util/LoggerFactory.php

diff --git a/src/Util/Logger/FriendicaIntrospectionProcessor.php b/src/Util/Logger/FriendicaIntrospectionProcessor.php
new file mode 100644 (file)
index 0000000..aa3933a
--- /dev/null
@@ -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 (file)
index 9f52a6f..0000000
+++ /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;
-       }
-}
index 961585ebfecd7ae9382a343d4dc8e0b51ab5303c..4d3a287165162ec8d80a5b87d398c7ee2d00e782 100644 (file)
@@ -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));