Merge pull request #7738 from annando/clean-url

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

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 67829546e91f1a9a1f5b4bf86f99c9ad602a203f..55091a4879456c81d366b669b83f93b28d8ee6c6 100644 (file)
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -25,6 +25,8 @@ use Psr\Log\LogLevel;
  */
 class LoggerFactory
 {
+       const DEV_CHANNEL = 'dev';
+
        /**
         * A list of classes, which shouldn't get logged
         *
@@ -36,10 +38,17 @@ class LoggerFactory
                'Friendica\\Util\\Logger',
        ];
 
+       private $channel;
+
+       public function __construct(string $channel)
+       {
+               $this->channel = $channel;
+       }
+
        /**
         * Creates a new PSR-3 compliant logger instances
         *
-        * @param string        $channel  The channel of the logger instance
+        * @param Database      $database The Friendica Database instance
         * @param Configuration $config   The config
         * @param Profiler      $profiler The profiler of the app
         *
@@ -48,12 +57,11 @@ class LoggerFactory
         * @throws \Exception
         * @throws InternalServerErrorException
         */
-       public static function create($channel, Database $database, Configuration $config, Profiler $profiler)
+       public function create( Database $database, Configuration $config, Profiler $profiler)
        {
                if (empty($config->get('system', 'debugging', false))) {
                        $logger = new VoidLogger();
                        $database->setLogger($logger);
-                       Logger::init($logger);
                        return $logger;
                }
 
@@ -66,7 +74,7 @@ class LoggerFactory
                                $loggerTimeZone = new \DateTimeZone('UTC');
                                Monolog\Logger::setTimezone($loggerTimeZone);
 
-                               $logger = new Monolog\Logger($channel);
+                               $logger = new Monolog\Logger($this->channel);
                                $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
                                $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
                                $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -81,7 +89,7 @@ class LoggerFactory
                                break;
 
                        case 'syslog':
-                               $logger = new SyslogLogger($channel, $introspection, $loglevel);
+                               $logger = new SyslogLogger($this->channel, $introspection, $loglevel);
                                break;
 
                        case 'stream':
@@ -89,7 +97,7 @@ class LoggerFactory
                                $stream = $config->get('system', 'logfile');
                                // just add a stream in case it's either writable or not file
                                if (!is_file($stream) || is_writable($stream)) {
-                                       $logger = new StreamLogger($channel, $stream, $introspection, $loglevel);
+                                       $logger = new StreamLogger($this->channel, $stream, $introspection, $loglevel);
                                } else {
                                        $logger = new VoidLogger();
                                }
@@ -104,8 +112,6 @@ class LoggerFactory
                }
 
                $database->setLogger($logger);
-               Logger::init($logger);
-
                return $logger;
        }
 
@@ -117,7 +123,6 @@ class LoggerFactory
         *
         * It should never get filled during normal usage of Friendica
         *
-        * @param string        $channel  The channel of the logger instance
         * @param Configuration $config   The config
         * @param Profiler      $profiler The profiler of the app
         *
@@ -126,7 +131,7 @@ class LoggerFactory
         * @throws InternalServerErrorException
         * @throws \Exception
         */
-       public static function createDev($channel, Configuration $config, Profiler $profiler)
+       public static function createDev(Configuration $config, Profiler $profiler)
        {
                $debugging   = $config->get('system', 'debugging');
                $stream      = $config->get('system', 'dlogfile');
@@ -135,7 +140,6 @@ class LoggerFactory
                if ((!isset($developerIp) || !$debugging) &&
                    (!is_file($stream) || is_writable($stream))) {
                        $logger = new VoidLogger();
-                       Logger::setDevLogger($logger);
                        return $logger;
                }
 
@@ -150,7 +154,7 @@ class LoggerFactory
                                $loggerTimeZone = new \DateTimeZone('UTC');
                                Monolog\Logger::setTimezone($loggerTimeZone);
 
-                               $logger = new Monolog\Logger($channel);
+                               $logger = new Monolog\Logger(self::DEV_CHANNEL);
                                $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
                                $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
                                $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -162,12 +166,12 @@ class LoggerFactory
                                break;
 
                        case 'syslog':
-                               $logger = new SyslogLogger($channel, $introspection, LogLevel::DEBUG);
+                               $logger = new SyslogLogger(self::DEV_CHANNEL, $introspection, LogLevel::DEBUG);
                                break;
 
                        case 'stream':
                        default:
-                               $logger = new StreamLogger($channel, $stream, $introspection, LogLevel::DEBUG);
+                               $logger = new StreamLogger(self::DEV_CHANNEL, $stream, $introspection, LogLevel::DEBUG);
                                break;
                }
 
@@ -178,8 +182,6 @@ class LoggerFactory
                        $logger = new ProfilerLogger($logger, $profiler);
                }
 
-               Logger::setDevLogger($logger);
-
                return $logger;
        }