nextcloud / server

lib/private/Log/Rotate.php

Indentation +18 added lines, -18 removed lines

@@ -32,23 +32,23 @@
  * location and manage that with your own tools.
  */
 class Rotate extends \OC\BackgroundJob\Job {
-	private $max_log_size;
-	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', 100 * 1024 * 1024);
-		if ($this->max_log_size) {
-			$filesize = @filesize($logFile);
-			if ($filesize >= $this->max_log_size) {
-				$this->rotate($logFile);
-			}
-		}
-	}
+    private $max_log_size;
+    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', 100 * 1024 * 1024);
+        if ($this->max_log_size) {
+            $filesize = @filesize($logFile);
+            if ($filesize >= $this->max_log_size) {
+                $this->rotate($logFile);
+            }
+        }
+    }
 
-	protected function rotate($logfile) {
-		$rotatedLogfile = $logfile.'.1';
-		rename($logfile, $rotatedLogfile);
-		$msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
-		\OCP\Util::writeLog(Rotate::class, $msg, \OCP\Util::WARN);
-	}
+    protected function rotate($logfile) {
+        $rotatedLogfile = $logfile.'.1';
+        rename($logfile, $rotatedLogfile);
+        $msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
+        \OCP\Util::writeLog(Rotate::class, $msg, \OCP\Util::WARN);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	private $max_log_size;
 	public function run($dummy) {
 		$systemConfig = \OC::$server->getSystemConfig();
-		$logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+		$logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log');
 		$this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 		if ($this->max_log_size) {
 			$filesize = @filesize($logFile);

core/Command/Log/File.php

Indentation +119 added lines, -119 removed lines

@@ -36,123 +36,123 @@
 
 class File extends Command implements Completion\CompletionAwareInterface {
 
-	/** @var IConfig */
-	protected $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:file')
-			->setDescription('manipulate logging backend')
-			->addOption(
-				'enable',
-				null,
-				InputOption::VALUE_NONE,
-				'enable this logging backend'
-			)
-			->addOption(
-				'file',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log file path'
-			)
-			->addOption(
-				'rotate-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the file size for log rotation, 0 = disabled'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$toBeSet = [];
-
-		if ($input->getOption('enable')) {
-			$toBeSet['log_type'] = 'file';
-		}
-
-		if ($file = $input->getOption('file')) {
-			$toBeSet['logfile'] = $file;
-		}
-
-		if (($rotateSize = $input->getOption('rotate-size')) !== null) {
-			$rotateSize = \OCP\Util::computerFileSize($rotateSize);
-			$this->validateRotateSize($rotateSize);
-			$toBeSet['log_rotate_size'] = $rotateSize;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display config
-		// TODO: Drop backwards compatibility for config in the future
-		$logType = $this->config->getSystemValue('log_type', 'file');
-		if ($logType === 'file' || $logType === 'owncloud') {
-			$enabledText = 'enabled';
-		} else {
-			$enabledText = 'disabled';
-		}
-		$output->writeln('Log backend file: '.$enabledText);
-
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
-		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
-		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
-
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
-		if ($rotateSize) {
-			$rotateString = \OCP\Util::humanFileSize($rotateSize);
-		} else {
-			$rotateString = 'disabled';
-		}
-		$output->writeln('Rotate at: '.$rotateString);
-	}
-
-	/**
-	 * @param mixed $rotateSize
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateRotateSize(&$rotateSize) {
-		if ($rotateSize === false) {
-			throw new \InvalidArgumentException('Error parsing log rotation file size');
-		}
-		$rotateSize = (int) $rotateSize;
-		if ($rotateSize < 0) {
-			throw new \InvalidArgumentException('Log rotation file size must be non-negative');
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'file') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'file',
-				Completion::TYPE_OPTION
-			);
-			return $helper->run();
-		} else if ($optionName === 'rotate-size') {
-			return [0];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    /** @var IConfig */
+    protected $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:file')
+            ->setDescription('manipulate logging backend')
+            ->addOption(
+                'enable',
+                null,
+                InputOption::VALUE_NONE,
+                'enable this logging backend'
+            )
+            ->addOption(
+                'file',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log file path'
+            )
+            ->addOption(
+                'rotate-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the file size for log rotation, 0 = disabled'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $toBeSet = [];
+
+        if ($input->getOption('enable')) {
+            $toBeSet['log_type'] = 'file';
+        }
+
+        if ($file = $input->getOption('file')) {
+            $toBeSet['logfile'] = $file;
+        }
+
+        if (($rotateSize = $input->getOption('rotate-size')) !== null) {
+            $rotateSize = \OCP\Util::computerFileSize($rotateSize);
+            $this->validateRotateSize($rotateSize);
+            $toBeSet['log_rotate_size'] = $rotateSize;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display config
+        // TODO: Drop backwards compatibility for config in the future
+        $logType = $this->config->getSystemValue('log_type', 'file');
+        if ($logType === 'file' || $logType === 'owncloud') {
+            $enabledText = 'enabled';
+        } else {
+            $enabledText = 'disabled';
+        }
+        $output->writeln('Log backend file: '.$enabledText);
+
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
+        $defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
+        $output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
+
+        $rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
+        if ($rotateSize) {
+            $rotateString = \OCP\Util::humanFileSize($rotateSize);
+        } else {
+            $rotateString = 'disabled';
+        }
+        $output->writeln('Rotate at: '.$rotateString);
+    }
+
+    /**
+     * @param mixed $rotateSize
+     * @throws \InvalidArgumentException
+     */
+    protected function validateRotateSize(&$rotateSize) {
+        if ($rotateSize === false) {
+            throw new \InvalidArgumentException('Error parsing log rotation file size');
+        }
+        $rotateSize = (int) $rotateSize;
+        if ($rotateSize < 0) {
+            throw new \InvalidArgumentException('Log rotation file size must be non-negative');
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'file') {
+            $helper = new ShellPathCompletion(
+                $this->getName(),
+                'file',
+                Completion::TYPE_OPTION
+            );
+            return $helper->run();
+        } else if ($optionName === 'rotate-size') {
+            return [0];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
 		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
 
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
+		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 		if ($rotateSize) {
 			$rotateString = \OCP\Util::humanFileSize($rotateSize);
 		} else {