Group selection: Respect "pubmail" and ignore atchived or blocked contacts

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

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 2a054607cade11bc25dc486c5893641bd7cb851d..f21fe9b7f50fa04f6de3f7b24fecc42a34bc5b20 100644 (file)
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -6,6 +6,7 @@ use Friendica\Core\Config\Configuration;
 use Friendica\Core\Logger;
 use Friendica\Database\Database;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\FileSystem;
 use Friendica\Util\Introspection;
 use Friendica\Util\Logger\Monolog\DevelopHandler;
 use Friendica\Util\Logger\Monolog\IntrospectionProcessor;
@@ -25,6 +26,8 @@ use Psr\Log\LogLevel;
  */
 class LoggerFactory
 {
+       const DEV_CHANNEL = 'dev';
+
        /**
         * A list of classes, which shouldn't get logged
         *
@@ -36,24 +39,28 @@ 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
+        * @param FileSystem    $fileSystem FileSystem utils
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
-        *
-        * @throws \Exception
-        * @throws InternalServerErrorException
         */
-       public function create($channel, Database $database, Configuration $config, Profiler $profiler)
+       public function create(Database $database, Configuration $config, Profiler $profiler, FileSystem $fileSystem)
        {
                if (empty($config->get('system', 'debugging', false))) {
                        $logger = new VoidLogger();
                        $database->setLogger($logger);
-                       Logger::init($logger);
                        return $logger;
                }
 
@@ -66,7 +73,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());
@@ -76,12 +83,22 @@ class LoggerFactory
 
                                // just add a stream in case it's either writable or not file
                                if (!is_file($stream) || is_writable($stream)) {
-                                       static::addStreamHandler($logger, $stream, $loglevel);
+                                       try {
+                                               static::addStreamHandler($logger, $stream, $loglevel);
+                                       } catch (\Throwable $e) {
+                                               // No Logger ..
+                                               $logger = new VoidLogger();
+                                       }
                                }
                                break;
 
                        case 'syslog':
-                               $logger = new SyslogLogger($channel, $introspection, $loglevel);
+                               try {
+                                       $logger = new SyslogLogger($this->channel, $introspection, $loglevel);
+                               } catch (\Throwable $e) {
+                                       // No logger ...
+                                       $logger = new VoidLogger();
+                               }
                                break;
 
                        case 'stream':
@@ -89,7 +106,12 @@ 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);
+                                       try {
+                                               $logger = new StreamLogger($this->channel, $stream, $introspection, $fileSystem, $loglevel);
+                                       } catch (\Throwable $t) {
+                                               // No logger ...
+                                               $logger = new VoidLogger();
+                                       }
                                } else {
                                        $logger = new VoidLogger();
                                }
@@ -104,8 +126,6 @@ class LoggerFactory
                }
 
                $database->setLogger($logger);
-               Logger::init($logger);
-
                return $logger;
        }
 
@@ -117,16 +137,16 @@ 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
+        * @param FileSystem    $fileSystem FileSystem utils
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
         *
         * @throws InternalServerErrorException
         * @throws \Exception
         */
-       public static function createDev($channel, Configuration $config, Profiler $profiler)
+       public static function createDev(Configuration $config, Profiler $profiler, FileSystem $fileSystem)
        {
                $debugging   = $config->get('system', 'debugging');
                $stream      = $config->get('system', 'dlogfile');
@@ -135,7 +155,6 @@ class LoggerFactory
                if ((!isset($developerIp) || !$debugging) &&
                    (!is_file($stream) || is_writable($stream))) {
                        $logger = new VoidLogger();
-                       Logger::setDevLogger($logger);
                        return $logger;
                }
 
@@ -150,7 +169,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 +181,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, $fileSystem, LogLevel::DEBUG);
                                break;
                }
 
@@ -178,8 +197,6 @@ class LoggerFactory
                        $logger = new ProfilerLogger($logger, $profiler);
                }
 
-               Logger::setDevLogger($logger);
-
                return $logger;
        }
 
@@ -209,7 +226,6 @@ class LoggerFactory
                                return LogLevel::INFO;
                        // legacy DATA
                        case "4":
-                               return LogLevel::DEBUG;
                        // legacy ALL
                        case "5":
                                return LogLevel::DEBUG;
@@ -228,7 +244,6 @@ class LoggerFactory
         *
         * @return void
         *
-        * @throws InternalServerErrorException if the logger is incompatible to the logger factory
         * @throws \Exception in case of general failures
         */
        public static function addStreamHandler($logger, $stream, $level = LogLevel::NOTICE)
@@ -247,8 +262,6 @@ class LoggerFactory
                        $fileHandler->setFormatter($formatter);
 
                        $logger->pushHandler($fileHandler);
-               } else {
-                       throw new InternalServerErrorException('Logger instance incompatible for MonologFactory');
                }
        }