Merge pull request #2914 from nextcloud/logrotate-logfile

Get the logfile location while running the logrotate cron job instead…
nextcloud · Jan 10, 2017 · 30689f3 · 30689f3
2 parents aee1100 + 54f96e5
commit 30689f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -883,7 +883,7 @@ public static function registerLogRotate() {
 		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
@@ -32,7 +32,9 @@
  */
 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);