From 07bbec33559a104e844fd1d6960f3f2d7be3fa21 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 16 Jul 2019 10:15:00 +0200 Subject: Move log detail aggregation to separate class and reuse it in syslog/systemd logger MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/Log/Syslog.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/private/Log/Syslog.php') diff --git a/lib/private/Log/Syslog.php b/lib/private/Log/Syslog.php index b652eb4343d..b8fba34d62b 100644 --- a/lib/private/Log/Syslog.php +++ b/lib/private/Log/Syslog.php @@ -25,11 +25,11 @@ namespace OC\Log; +use OC\SystemConfig; use OCP\ILogger; -use OCP\IConfig; use OCP\Log\IWriter; -class Syslog implements IWriter { +class Syslog extends LogDetails implements IWriter { protected $levels = [ ILogger::DEBUG => LOG_DEBUG, ILogger::INFO => LOG_INFO, @@ -38,7 +38,8 @@ class Syslog implements IWriter { ILogger::FATAL => LOG_CRIT, ]; - public function __construct(IConfig $config) { + public function __construct(SystemConfig $config) { + parent::__construct($config); openlog($config->getSystemValue('syslog_tag', 'Nextcloud'), LOG_PID | LOG_CONS, LOG_USER); } @@ -54,6 +55,6 @@ class Syslog implements IWriter { */ public function write(string $app, $message, int $level) { $syslog_level = $this->levels[$level]; - syslog($syslog_level, '{'.$app.'} '.$message); + syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level)); } } -- cgit v1.2.3