wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2914 from nextcloud/logrotate-logfile

Browse source 
Get the logfile location while running the logrotate cron job instead…
This commit is contained in:
Morris Jobke 2017-01-10 14:28:09 +01:00 committed by GitHub
commit 30689f338f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/base.php
View file

@ -883,7 +883,7 @@ class OC {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) { 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 //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 //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');
} }
} }

4
lib/private/Log/Rotate.php
View file

@ -32,7 +32,9 @@ namespace OC\Log;
*/ */
class Rotate extends \OC\BackgroundJob\Job { class Rotate extends \OC\BackgroundJob\Job {
private $max_log_size; 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); $this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false);
if ($this->max_log_size) { if ($this->max_log_size) {
$filesize = @filesize($logFile); $filesize = @filesize($logFile);