X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FLoggerFactory.php;h=444a98cde5c48300b1e15df77037ac8d1991da70;hb=8eba329111e832d7efdacf4f6a6fa85b0f7abbf3;hp=0ab4c2ac20aaf74095c709f2a66eae9d0baca757;hpb=81ba5376d0ef778ccad48d4869d43787f8dc9f09;p=friendica.git diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php index 0ab4c2ac20..444a98cde5 100644 --- a/src/Factory/LoggerFactory.php +++ b/src/Factory/LoggerFactory.php @@ -6,13 +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; @@ -32,7 +31,7 @@ class LoggerFactory private static $ignoreClassList = [ Logger::class, Profiler::class, - WorkerLogger::class + 'Friendica\\Util\\Logger', ]; /** @@ -57,6 +56,7 @@ class LoggerFactory $introspection = new Introspection(self::$ignoreClassList); $level = $config->get('system', 'loglevel'); + $loglevel = self::mapLegacyConfigDebugLevel((string)$level); switch ($config->get('system', 'logger_config', 'stream')) { case 'monolog': @@ -67,22 +67,21 @@ 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'); - $loglevel = self::mapLegacyConfigDebugLevel((string)$level); static::addStreamHandler($logger, $stream, $loglevel); break; case 'syslog': - $logger = new SyslogLogger($channel, $introspection, $level); + $logger = new SyslogLogger($channel, $introspection, $loglevel); break; case 'stream': default: $stream = $config->get('system', 'logfile'); - $logger = new StreamLogger($channel, $stream, $introspection, $level); + $logger = new StreamLogger($channel, $stream, $introspection, $loglevel); break; } @@ -135,13 +134,16 @@ class LoggerFactory 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 FriendicaIntrospectionProcessor($introspection, LogLevel::DEBUG)); + $logger->pushProcessor(new IntrospectionProcessor($introspection, LogLevel::DEBUG)); - $logger->pushHandler(new FriendicaDevelopHandler($developerIp)); + $logger->pushHandler(new DevelopHandler($developerIp)); static::addStreamHandler($logger, $stream, LogLevel::DEBUG); break;