From 21158e7699645cfa220ff6561bba428cbc90d438 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 27 Feb 2019 18:55:26 +0100 Subject: [PATCH] Syslog - Disabling --- src/Factory/LoggerFactory.php | 18 ++--- src/Util/Logger/VoidLogger.php | 140 +++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 9 deletions(-) create mode 100644 src/Util/Logger/VoidLogger.php diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php index 863b30e57..3658d33a5 100644 --- a/src/Factory/LoggerFactory.php +++ b/src/Factory/LoggerFactory.php @@ -8,6 +8,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Util\Logger\FriendicaDevelopHandler; use Friendica\Util\Logger\Introspection; use Friendica\Util\Logger\SyslogLogger; +use Friendica\Util\Logger\VoidLogger; use Friendica\Util\Logger\WorkerLogger; use Friendica\Util\Profiler; use Monolog; @@ -42,6 +43,10 @@ class LoggerFactory */ public static function create($channel, Configuration $config) { + if (empty($config->get('system', 'debugging', false))) { + return new VoidLogger(); + } + $introspector = new Introspection(LogLevel::DEBUG, self::$ignoreClassList); switch ($config->get('system', 'logger_adapter', 'monolog')) { case 'syslog': @@ -60,16 +65,11 @@ class LoggerFactory $logger->pushProcessor(new Monolog\Processor\UidProcessor()); $logger->pushProcessor($introspector); - $debugging = $config->get('system', 'debugging'); - $stream = $config->get('system', 'logfile'); - $level = $config->get('system', 'loglevel'); + $stream = $config->get('system', 'logfile'); + $level = $config->get('system', 'loglevel'); - if ($debugging) { - $loglevel = self::mapLegacyConfigDebugLevel((string)$level); - static::addStreamHandler($logger, $stream, $loglevel); - } else { - static::addVoidHandler($logger); - } + $loglevel = self::mapLegacyConfigDebugLevel((string)$level); + static::addStreamHandler($logger, $stream, $loglevel); break; } diff --git a/src/Util/Logger/VoidLogger.php b/src/Util/Logger/VoidLogger.php new file mode 100644 index 000000000..16cd10da0 --- /dev/null +++ b/src/Util/Logger/VoidLogger.php @@ -0,0 +1,140 @@ +