Remove code parameter from HTTPException constructor

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

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index f940d9d84c9b189db6e6a96311a1c04453e38e53..444a98cde5c48300b1e15df77037ac8d1991da70 100644 (file)
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -6,11 +6,12 @@ use Friendica\Core\Config\Configuration;
 use Friendica\Core\Logger;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Introspection;
-use Friendica\Util\Logger\Monolog\FriendicaDevelopHandler;
-use Friendica\Util\Logger\Monolog\FriendicaIntrospectionProcessor;
+use Friendica\Util\Logger\Monolog\DevelopHandler;
+use Friendica\Util\Logger\Monolog\IntrospectionProcessor;
+use Friendica\Util\Logger\ProfilerLogger;
+use Friendica\Util\Logger\StreamLogger;
 use Friendica\Util\Logger\SyslogLogger;
 use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\Logger\WorkerLogger;
 use Friendica\Util\Profiler;
 use Monolog;
 use Psr\Log\LoggerInterface;
@@ -30,7 +31,7 @@ class LoggerFactory
        private static $ignoreClassList = [
                Logger::class,
                Profiler::class,
-               WorkerLogger::class
+               'Friendica\\Util\\Logger',
        ];
 
        /**
@@ -38,13 +39,14 @@ class LoggerFactory
         *
         * @param string        $channel The channel of the logger instance
         * @param Configuration $config  The config
+        * @param Profiler      $profiler The profiler of the app
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
         *
         * @throws \Exception
         * @throws InternalServerErrorException
         */
-       public static function create($channel, Configuration $config)
+       public static function create($channel, Configuration $config, Profiler $profiler)
        {
                if (empty($config->get('system', 'debugging', false))) {
                        $logger = new VoidLogger();
@@ -53,15 +55,11 @@ class LoggerFactory
                }
 
                $introspection = new Introspection(self::$ignoreClassList);
+               $level = $config->get('system', 'loglevel');
+               $loglevel = self::mapLegacyConfigDebugLevel((string)$level);
 
-               switch ($config->get('system', 'logger_adapter', 'monolog')) {
-                       case 'syslog':
-                               $level = $config->get('system', 'loglevel');
-
-                               $logger = new SyslogLogger($channel, $introspection, $level);
-                               break;
+               switch ($config->get('system', 'logger_config', 'stream')) {
                        case 'monolog':
-                       default:
                                $loggerTimeZone = new \DateTimeZone('UTC');
                                Monolog\Logger::setTimezone($loggerTimeZone);
 
@@ -69,14 +67,29 @@ class LoggerFactory
                                $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
                                $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
                                $logger->pushProcessor(new Monolog\Processor\UidProcessor());
-                               $logger->pushProcessor(new FriendicaIntrospectionProcessor($introspection, LogLevel::DEBUG));
+                               $logger->pushProcessor(new IntrospectionProcessor($introspection, LogLevel::DEBUG));
 
                                $stream = $config->get('system', 'logfile');
-                               $level  = $config->get('system', 'loglevel');
 
-                               $loglevel = self::mapLegacyConfigDebugLevel((string)$level);
                                static::addStreamHandler($logger, $stream, $loglevel);
                                break;
+
+                       case 'syslog':
+                               $logger = new SyslogLogger($channel, $introspection, $loglevel);
+                               break;
+
+                       case 'stream':
+                       default:
+                               $stream = $config->get('system', 'logfile');
+                               $logger = new StreamLogger($channel, $stream, $introspection, $loglevel);
+                               break;
+               }
+
+               $profiling = $config->get('system', 'profiling', false);
+
+               // In case profiling is enabled, wrap the ProfilerLogger around the current logger
+               if (isset($profiling) && $profiling !== false) {
+                       $logger = new ProfilerLogger($logger, $profiler);
                }
 
                Logger::init($logger);
@@ -94,18 +107,23 @@ class LoggerFactory
         *
         * @param string        $channel The channel of the logger instance
         * @param Configuration $config  The config
+        * @param Profiler      $profiler The profiler of the app
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
+        *
         * @throws InternalServerErrorException
+        * @throws \Exception
         */
-       public static function createDev($channel, Configuration $config)
+       public static function createDev($channel, Configuration $config, Profiler $profiler)
        {
                $debugging   = $config->get('system', 'debugging');
                $stream      = $config->get('system', 'dlogfile');
                $developerIp = $config->get('system', 'dlogip');
 
                if (!isset($developerIp) || !$debugging) {
-                       return null;
+                       $logger = new VoidLogger();
+                       Logger::setDevLogger($logger);
+                       return $logger;
                }
 
                $loggerTimeZone = new \DateTimeZone('UTC');
@@ -113,15 +131,39 @@ class LoggerFactory
 
                $introspection = new Introspection(self::$ignoreClassList);
 
-               $logger = new Monolog\Logger($channel);
-               $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
-               $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
-               $logger->pushProcessor(new Monolog\Processor\UidProcessor());
-               $logger->pushProcessor(new FriendicaIntrospectionProcessor($introspection, LogLevel::DEBUG));
+               switch ($config->get('system', 'logger_config', 'stream')) {
+
+                       case 'monolog':
+                               $loggerTimeZone = new \DateTimeZone('UTC');
+                               Monolog\Logger::setTimezone($loggerTimeZone);
+
+                               $logger = new Monolog\Logger($channel);
+                               $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
+                               $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
+                               $logger->pushProcessor(new Monolog\Processor\UidProcessor());
+                               $logger->pushProcessor(new IntrospectionProcessor($introspection, LogLevel::DEBUG));
 
-               $logger->pushHandler(new FriendicaDevelopHandler($developerIp));
+                               $logger->pushHandler(new DevelopHandler($developerIp));
+
+                               static::addStreamHandler($logger, $stream, LogLevel::DEBUG);
+                               break;
 
-               static::addStreamHandler($logger, $stream, LogLevel::DEBUG);
+                       case 'syslog':
+                               $logger = new SyslogLogger($channel, $introspection,  LogLevel::DEBUG);
+                               break;
+
+                       case 'stream':
+                       default:
+                               $logger = new StreamLogger($channel, $stream, $introspection, LogLevel::DEBUG);
+                               break;
+               }
+
+               $profiling = $config->get('system', 'profiling', false);
+
+               // In case profiling is enabled, wrap the ProfilerLogger around the current logger
+               if (isset($profiling) && $profiling !== false) {
+                       $logger = new ProfilerLogger($logger, $profiler);
+               }
 
                Logger::setDevLogger($logger);