Merge pull request #9137 from nextcloud/default-log-rotate-size

Set the default log rotate size to 100 MB

4 files changed, 5 insertions, 5 deletions

diff --git a/config/config.sample.php b/config/config.sample.php
index ba5f3d68146..d1341feb0d2 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -764,9 +764,9 @@ $CONFIG = array(
  * old logfile reaches your limit. If a rotated log file is already present, it
  * will be overwritten.
  *
- * Defaults to ``0`` (no rotation)
+ * Defaults to 100 MB
  */
-'log_rotate_size' => false,
+'log_rotate_size' => 100 * 1024 * 1024,
 
 
 /**
diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php
index e5db2c1acc4..8be01d2b6ef 100644
--- a/core/Command/Log/File.php
+++ b/core/Command/Log/File.php
@@ -105,7 +105,7 @@ class File extends Command implements Completion\CompletionAwareInterface {
 		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
 		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
 
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 0);
+		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
 		if ($rotateSize) {
 			$rotateString = \OCP\Util::humanFileSize($rotateSize);
 		} else {
diff --git a/lib/private/Log/Rotate.php b/lib/private/Log/Rotate.php
index d7c554374fd..97a772b5251 100644
--- a/lib/private/Log/Rotate.php
+++ b/lib/private/Log/Rotate.php
@@ -36,7 +36,7 @@ class Rotate extends \OC\BackgroundJob\Job {
 	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', 100 * 1024 * 1024);
 		if ($this->max_log_size) {
 			$filesize = @filesize($logFile);
 			if ($filesize >= $this->max_log_size) {
diff --git a/tests/Core/Command/Log/FileTest.php b/tests/Core/Command/Log/FileTest.php
index 4270684c9b6..4b8845277da 100644
--- a/tests/Core/Command/Log/FileTest.php
+++ b/tests/Core/Command/Log/FileTest.php
@@ -105,7 +105,7 @@ class FileTest extends TestCase {
 				['log_type', 'file', 'log_type_value'],
 				['datadirectory', \OC::$SERVERROOT.'/data', '/data/directory/'],
 				['logfile', '/data/directory/nextcloud.log', '/var/log/nextcloud.log'],
-				['log_rotate_size', 0, 5 * 1024 * 1024],
+				['log_rotate_size', 100 * 1024 * 1024, 5 * 1024 * 1024],
 			]));
 
 		$this->consoleOutput->expects($this->at(0))