diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-25 10:25:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 10:25:13 +0100 |
| commit | 272f4cd6df791733a6376679bcc936fe492d9e61 (patch) | |
| tree | 000f674ea3b3a141640ed2ad369389d8f6196eb6 /apps | |
| parent | 562c5730052b83a36b647bbd2db653dc57227f16 (diff) | |
| parent | 497c5841fc60b587dba84dd9ea14e4cccee656fd (diff) | |
| download | nextcloud-server-272f4cd6df791733a6376679bcc936fe492d9e61.tar.gz nextcloud-server-272f4cd6df791733a6376679bcc936fe492d9e61.zip | |
Merge pull request #30763 from nextcloud/feature/noid/allow-to-log-audit-to-syslog
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/admin_audit/lib/AppInfo/Application.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index 7b5fb520bc9..594e1c7f2c4 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -96,15 +96,19 @@ class Application extends App implements IBootstrap { } private function getLogger(IConfig $config, - LoggerInterface $logger, ILogFactory $logFactory): LoggerInterface { - $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log'; - $logFile = $config->getAppValue('admin_audit', 'logfile', $default); - - if ($logFile === null) { - return $logger; + $auditType = $config->getSystemValueString('log_type_audit', 'file'); + $defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud'); + $auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag); + $logFile = $config->getSystemValueString('logfile_audit', ''); + + if ($auditType === 'file' && !$logFile) { + $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log'; + // Legacy way was appconfig, now it's paralleled with the normal log config + $logFile = $config->getAppValue('admin_audit', 'logfile', $default); } - return $logFactory->getCustomPsrLogger($logFile); + + return $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag); } /** |