Merge pull request #6531 from Ixiter/develop-theme-frio

[friendica.git] / src / Util / LoggerFactory.php

diff --git a/src/Util/LoggerFactory.php b/src/Util/LoggerFactory.php
index e7b076bd6d9a225fba6f7aaf9636024ab222479f..88b6fe8c819bf978b3fd5be5772634f47894b515 100644 (file)
--- a/src/Util/LoggerFactory.php
+++ b/src/Util/LoggerFactory.php
@@ -4,6 +4,7 @@ namespace Friendica\Util;
 
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Logger\FriendicaDevelopHandler;
+use Friendica\Util\Logger\FriendicaProcessor;
 use Monolog;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -27,9 +28,7 @@ class LoggerFactory
                $logger = new Monolog\Logger($channel);
                $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
                $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
-
-               // Add more information in case of a warning and more
-               $logger->pushProcessor(new Monolog\Processor\IntrospectionProcessor(LogLevel::WARNING));
+               $logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, 1));
 
                return $logger;
        }
@@ -52,8 +51,8 @@ class LoggerFactory
                $logger = new Monolog\Logger($channel);
                $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
                $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
+               $logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, 1));
 
-               $logger->pushProcessor(new Monolog\Processor\IntrospectionProcessor());
 
                $logger->pushHandler(new FriendicaDevelopHandler($developerIp));
 
@@ -75,7 +74,13 @@ class LoggerFactory
        public static function addStreamHandler($logger, $stream, $level = LogLevel::NOTICE)
        {
                if ($logger instanceof Monolog\Logger) {
-                       $fileHandler = new Monolog\Handler\StreamHandler($stream, Monolog\Logger::toMonologLevel($level));
+                       $loglevel = Monolog\Logger::toMonologLevel($level);
+
+                       // fallback to notice if an invalid loglevel is set
+                       if (!is_int($loglevel)) {
+                               $loglevel = LogLevel::NOTICE;
+                       }
+                       $fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
 
                        $formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
                        $fileHandler->setFormatter($formatter);