X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FLoggerFactory.php;h=ad6658b563b6e8040f80d0ad36bc0922cd8e48f3;hb=5d61599964e74bb733816a5592eee2aed3bbba4e;hp=32a338fb0bd8b2da4d0291c4eaeb8a431462534b;hpb=eec4ee3feda717b751422aff3939089d5d562f7f;p=friendica.git diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php index 32a338fb0b..ad6658b563 100644 --- a/src/Factory/LoggerFactory.php +++ b/src/Factory/LoggerFactory.php @@ -1,10 +1,31 @@ . + * + */ namespace Friendica\Factory; -use Friendica\Core\Config\Configuration; +use Friendica\Core\Config\IConfig; 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; @@ -12,7 +33,6 @@ 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; @@ -25,45 +45,54 @@ use Psr\Log\LogLevel; */ class LoggerFactory { + const DEV_CHANNEL = 'dev'; + /** * A list of classes, which shouldn't get logged + * * @var array */ private static $ignoreClassList = [ Logger::class, Profiler::class, - WorkerLogger::class + '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 Configuration $config The config - * @param Profiler $profiler The profiler of the app + * @param Database $database The Friendica Database instance + * @param IConfig $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 static function create($channel, Configuration $config, Profiler $profiler) + public function create(Database $database, IConfig $config, Profiler $profiler, FileSystem $fileSystem) { if (empty($config->get('system', 'debugging', false))) { $logger = new VoidLogger(); - Logger::init($logger); + $database->setLogger($logger); return $logger; } $introspection = new Introspection(self::$ignoreClassList); - $level = $config->get('system', 'loglevel'); + $level = $config->get('system', 'loglevel'); + $loglevel = self::mapLegacyConfigDebugLevel((string)$level); switch ($config->get('system', 'logger_config', 'stream')) { case 'monolog': $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()); @@ -71,18 +100,40 @@ class LoggerFactory $stream = $config->get('system', 'logfile'); - $loglevel = self::mapLegacyConfigDebugLevel((string)$level); - static::addStreamHandler($logger, $stream, $loglevel); + // just add a stream in case it's either writable or not file + if (!is_file($stream) || is_writable($stream)) { + try { + static::addStreamHandler($logger, $stream, $loglevel); + } catch (\Throwable $e) { + // No Logger .. + $logger = new VoidLogger(); + } + } break; case 'syslog': - $logger = new SyslogLogger($channel, $introspection, $level); + try { + $logger = new SyslogLogger($this->channel, $introspection, $loglevel); + } catch (\Throwable $e) { + // No logger ... + $logger = new VoidLogger(); + } break; case 'stream': default: $stream = $config->get('system', 'logfile'); - $logger = new StreamLogger($channel, $stream, $introspection, $level); + // just add a stream in case it's either writable or not file + if (!is_file($stream) || is_writable($stream)) { + try { + $logger = new StreamLogger($this->channel, $stream, $introspection, $fileSystem, $loglevel); + } catch (\Throwable $t) { + // No logger ... + $logger = new VoidLogger(); + } + } else { + $logger = new VoidLogger(); + } break; } @@ -93,8 +144,7 @@ class LoggerFactory $logger = new ProfilerLogger($logger, $profiler); } - Logger::init($logger); - + $database->setLogger($logger); return $logger; } @@ -106,24 +156,24 @@ 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 IConfig $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(IConfig $config, Profiler $profiler, FileSystem $fileSystem) { $debugging = $config->get('system', 'debugging'); $stream = $config->get('system', 'dlogfile'); $developerIp = $config->get('system', 'dlogip'); - if (!isset($developerIp) || !$debugging) { + if ((!isset($developerIp) || !$debugging) && + (!is_file($stream) || is_writable($stream))) { $logger = new VoidLogger(); - Logger::setDevLogger($logger); return $logger; } @@ -135,7 +185,10 @@ class LoggerFactory switch ($config->get('system', 'logger_config', 'stream')) { case 'monolog': - $logger = new Monolog\Logger($channel); + $loggerTimeZone = new \DateTimeZone('UTC'); + Monolog\Logger::setTimezone($loggerTimeZone); + + $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()); @@ -147,12 +200,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; } @@ -163,13 +216,12 @@ class LoggerFactory $logger = new ProfilerLogger($logger, $profiler); } - Logger::setDevLogger($logger); - return $logger; } /** * 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 @@ -193,7 +245,6 @@ class LoggerFactory return LogLevel::INFO; // legacy DATA case "4": - return LogLevel::DEBUG; // legacy ALL case "5": return LogLevel::DEBUG; @@ -206,13 +257,12 @@ class LoggerFactory /** * Adding a handler to a given logger instance * - * @param LoggerInterface $logger The logger instance - * @param mixed $stream The stream which handles the logger output - * @param string $level The level, for which this handler at least should handle logging + * @param LoggerInterface $logger The logger instance + * @param mixed $stream The stream which handles the logger output + * @param string $level The level, for which this handler at least should handle logging * * @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) @@ -231,8 +281,6 @@ class LoggerFactory $fileHandler->setFormatter($formatter); $logger->pushHandler($fileHandler); - } else { - throw new InternalServerErrorException('Logger instance incompatible for MonologFactory'); } }