Use the owner, not the author

[friendica.git] / src / Core / Logger / Factory / Logger.php

diff --git a/src/Core/Logger/Factory/Logger.php b/src/Core/Logger/Factory/Logger.php
index 2821a813c2681c9a786fe3695e3041603182f1dc..f1086f5853c4cea47f23b244106ffb0e2a604337 100644 (file)
--- a/src/Core/Logger/Factory/Logger.php
+++ b/src/Core/Logger/Factory/Logger.php
@@ -22,134 +22,46 @@
 namespace Friendica\Core\Logger\Factory;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hooks\Capabilities\ICanManageInstances;
-use Friendica\Core\Logger\Exception\LogLevelException;
-use Friendica\Core\Logger\Type\ProfilerLogger;
-use Friendica\Core\Logger\Type\StreamLogger;
-use Friendica\Core\Logger\Type\SyslogLogger;
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
+use Friendica\Core\Logger\Capability\LogChannel;
+use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass;
+use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
 use Psr\Log\NullLogger;
+use Throwable;
 
 /**
- * A logger factory
+ * The logger factory for the core logging instances
  */
 class Logger
 {
-       const DEV_CHANNEL = 'dev';
-
-       /** @var string The log-channel (app, worker, ...) */
+       /** @var string The channel */
        protected $channel;
-       /** @var ICanManageInstances */
-       protected $instanceManager;
-       /** @var IManageConfigValues */
-       protected $config;
 
-       public function __construct(string $channel, ICanManageInstances $instanceManager, IManageConfigValues $config, string $logfile = null)
+       public function __construct(string $channel = LogChannel::DEFAULT)
        {
-               $this->channel         = $channel;
-               $this->instanceManager = $instanceManager;
-               $this->config          = $config;
-
-               $this->instanceManager
-                       ->registerStrategy(LoggerInterface::class, 'syslog', SyslogLogger::class)
-                       ->registerStrategy(LoggerInterface::class, 'stream', StreamLogger::class, isset($logfile) ? [$logfile] : null);
-
-               if ($this->config->get('system', 'profiling') ?? false) {
-                       $this->instanceManager->registerDecorator(LoggerInterface::class, ProfilerLogger::class);
-               }
+               $this->channel = $channel;
        }
 
-       /**
-        * Creates a new PSR-3 compliant logger instances
-        *
-        * @param string|null $loglevel (optional) A given loglevel in case the loglevel in the config isn't applicable
-        *
-        * @return LoggerInterface The PSR-3 compliant logger instance
-        */
-       public function create(string $loglevel = null): LoggerInterface
+       public function create(ICanCreateInstances $instanceCreator, IManageConfigValues $config, Profiler $profiler): LoggerInterface
        {
-               if (empty($this->config->get('system', 'debugging') ?? false)) {
+               if (empty($config->get('system', 'debugging') ?? false)) {
                        return new NullLogger();
                }
 
-               $loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($this->config->get('system', 'loglevel'));
-               $name     = $this->config->get('system', 'logger_config') ?? 'stream';
+               $name = $config->get('system', 'logger_config') ?? '';
 
                try {
-                       /** @var LoggerInterface */
-                       return $this->instanceManager->getInstance(LoggerInterface::class, $name, [$this->channel, $loglevel]);
-               } catch (LogLevelException $exception) {
-                       // If there's a wrong config value for loglevel, try again with standard
-                       $logger = $this->create(LogLevel::NOTICE);
-                       $logger->warning('Invalid loglevel set in config.', ['loglevel' => $loglevel]);
-                       return $logger;
-               } catch (\Throwable $e) {
+                       /** @var LoggerInterface $logger */
+                       $logger = $instanceCreator->create(LoggerInterface::class, $name, [$this->channel]);
+                       if ($config->get('system', 'profiling') ?? false) {
+                               return new ProfilerLoggerClass($logger, $profiler);
+                       } else {
+                               return $logger;
+                       }
+               } catch (Throwable $e) {
                        // No logger ...
                        return new NullLogger();
                }
        }
-
-       /**
-        * Creates a new PSR-3 compliant develop logger
-        *
-        * If you want to debug only interactions from your IP or the IP of a remote server for federation debug,
-        * you'll use this logger instance for the duration of your work.
-        *
-        * It should never get filled during normal usage of Friendica
-        *
-        * @return LoggerInterface The PSR-3 compliant logger instance
-        * @throws \Exception
-        */
-       public function createDev()
-       {
-               $debugging   = $this->config->get('system', 'debugging');
-               $stream      = $this->config->get('system', 'dlogfile');
-               $developerIp = $this->config->get('system', 'dlogip');
-
-               if ((!isset($developerIp) || !$debugging) &&
-                       (!is_file($stream) || is_writable($stream))) {
-                       return new NullLogger();
-               }
-
-               $name = $this->config->get('system', 'logger_config') ?? 'stream';
-
-               /** @var LoggerInterface */
-               return $this->instanceManager->getInstance(LoggerInterface::class, $name, [self::DEV_CHANNEL, LogLevel::DEBUG, $stream]);
-       }
-
-       /**
-        * Mapping a legacy level to the PSR-3 compliant levels
-        *
-        * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
-        *
-        * @param string $level the level to be mapped
-        *
-        * @return string the PSR-3 compliant level
-        */
-       private static function mapLegacyConfigDebugLevel(string $level): string
-       {
-               switch ($level) {
-                       // legacy WARNING
-                       case "0":
-                               return LogLevel::ERROR;
-                       // legacy INFO
-                       case "1":
-                               return LogLevel::WARNING;
-                       // legacy TRACE
-                       case "2":
-                               return LogLevel::NOTICE;
-                       // legacy DEBUG
-                       case "3":
-                               return LogLevel::INFO;
-                       // legacy DATA
-                       case "4":
-                       // legacy ALL
-                       case "5":
-                               return LogLevel::DEBUG;
-                       // default if nothing set
-                       default:
-                               return $level;
-               }
-       }
 }