diff options
author | Johannes Ernst <jernst@indiecomputing.com> | 2018-06-06 20:40:06 +0000 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-06-29 10:37:45 +0200 |
commit | 0a65e62f29664730ac1aabcb612301be329ceed2 (patch) | |
tree | 3e510f67a5788138fb95bdea9f9bd7b795747c1b /lib/private/Log | |
parent | 3ff3141a1e4c9482ddaa68e13f545eb7e62ff9b7 (diff) | |
download | nextcloud-server-0a65e62f29664730ac1aabcb612301be329ceed2.tar.gz nextcloud-server-0a65e62f29664730ac1aabcb612301be329ceed2.zip |
Added a logger for systemd/journald
Added a unit test
Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
Diffstat (limited to 'lib/private/Log')
-rw-r--r-- | lib/private/Log/LogFactory.php | 3 | ||||
-rw-r--r-- | lib/private/Log/Systemdlog.php | 68 |
2 files changed, 71 insertions, 0 deletions
diff --git a/lib/private/Log/LogFactory.php b/lib/private/Log/LogFactory.php index 9b9d12abfa8..5bb803cbaf2 100644 --- a/lib/private/Log/LogFactory.php +++ b/lib/private/Log/LogFactory.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de> * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Johannes Ernst <jernst@indiecomputing.com> * * @license GNU AGPL version 3 or any later version * @@ -50,6 +51,8 @@ class LogFactory implements ILogFactory { return new Errorlog(); case 'syslog': return $this->c->resolve(Syslog::class); + case 'systemd': + return $this->c->resolve(Systemdlog::class); case 'file': return $this->buildLogFile(); diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php new file mode 100644 index 00000000000..63b228bfa0e --- /dev/null +++ b/lib/private/Log/Systemdlog.php @@ -0,0 +1,68 @@ +<?php +/** + * @copyright Copyright (c) 2018, Johannes Ernst + * + * @author Johannes Ernst <jernst@indiecomputing.com> + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OC\Log; + +use OCP\ILogger; +use OCP\IConfig; +use OCP\Log\IWriter; + +// The following fields are understood by systemd/journald, see +// man systemd.journal-fields. All are optional: +// MESSAGE= +// The human-readable message string for this entry. +// MESSAGE_ID= +// A 128-bit message identifier ID +// PRIORITY= +// A priority value between 0 ("emerg") and 7 ("debug") +// CODE_FILE=, CODE_LINE=, CODE_FUNC= +// The code location generating this message, if known +// ERRNO= +// The low-level Unix error number causing this entry, if any. +// SYSLOG_FACILITY=, SYSLOG_IDENTIFIER=, SYSLOG_PID= +// Syslog compatibility fields + +class Systemdlog implements IWriter { + protected $levels = [ + ILogger::DEBUG => 7, + ILogger::INFO => 6, + ILogger::WARN => 4, + ILogger::ERROR => 3, + ILogger::FATAL => 2, + ]; + + public function __construct(IConfig $config) { + } + + /** + * write a message in the log + * @param string $app + * @param string $message + * @param int $level + */ + public function write(string $app, $message, int $level) { + $journal_level = $this->levels[$level]; + sd_journal_send('PRIORITY='.$journal_level, + 'SYSLOG_IDENTIFIER=nextcloud', + 'MESSAGE={'.$app.'} '.$message); + } +} |