diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-01-10 14:28:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 14:28:09 +0100 |
| commit | 30689f338faf5327e13b65d3b4a2d85f9e79064d (patch) | |
| tree | c6c973f58a7b0afb47cb31ef89b8fc215f435913 | |
| parent | aee11009bd8c594adb16fb40f890b231d0ecc2ad (diff) | |
| parent | 54f96e5f58d0e5f7239e7274ac239fec807fa206 (diff) | |
| download | nextcloud-server-30689f338faf5327e13b65d3b4a2d85f9e79064d.tar.gz nextcloud-server-30689f338faf5327e13b65d3b4a2d85f9e79064d.zip | |
Merge pull request #2914 from nextcloud/logrotate-logfile
Get the logfile location while running the logrotate cron job instead…
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rw-r--r-- | lib/private/Log/Rotate.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 8b271010b10..23eda212f03 100644 --- a/lib/base.php +++ b/lib/base.php @@ -883,7 +883,7 @@ class OC { if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) { //don't try to do this before we are properly setup //use custom logfile path if defined, otherwise use default of nextcloud.log in data directory - \OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/nextcloud.log')); + \OC::$server->getJobList()->add('OC\Log\Rotate'); } } diff --git a/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php index 6c87c167378..866068433ff 100644 --- a/lib/private/Log/Rotate.php +++ b/lib/private/Log/Rotate.php @@ -32,7 +32,9 @@ namespace OC\Log; */ class Rotate extends \OC\BackgroundJob\Job { private $max_log_size; - public function run($logFile) { + public function run($dummy) { + $systemConfig = \OC::$server->getSystemConfig(); + $logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log'); $this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false); if ($this->max_log_size) { $filesize = @filesize($logFile); |