From c694bd34551affce44418541a3d1121c0dd04f2c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 21 Nov 2016 13:46:31 +0100 Subject: [PATCH] remove old logging section Signed-off-by: Robin Appelman --- lib/private/Settings/Admin/Logging.php | 86 ------------------ lib/private/Settings/Manager.php | 6 -- settings/Controller/LogSettingsController.php | 57 ------------ settings/templates/admin/logging.php | 88 ------------------- 4 files changed, 237 deletions(-) delete mode 100644 lib/private/Settings/Admin/Logging.php delete mode 100644 settings/templates/admin/logging.php diff --git a/lib/private/Settings/Admin/Logging.php b/lib/private/Settings/Admin/Logging.php deleted file mode 100644 index 407248ac4b1..00000000000 --- a/lib/private/Settings/Admin/Logging.php +++ /dev/null @@ -1,86 +0,0 @@ - - * - * @author Arthur Schiwon - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -namespace OC\Settings\Admin; - -use OC\Log\File as LogFile; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; -use OCP\Settings\ISettings; - -class Logging implements ISettings { - /** @var IConfig */ - private $config; - - /** - * @param IConfig $config - */ - public function __construct(IConfig $config) { - $this->config = $config; - } - - /** - * @return TemplateResponse - */ - public function getForm() { - $logType = $this->config->getSystemValue('log_type', 'file'); - $showLog = ($logType === 'file' || $logType === 'owncloud'); - - $numEntriesToLoad = 5; - $entries = LogFile::getEntries($numEntriesToLoad + 1); - $entriesRemaining = count($entries) > $numEntriesToLoad; - $entries = array_slice($entries, 0, $numEntriesToLoad); - - $logFileExists = file_exists(LogFile::getLogFilePath()) ; - $logFileSize = $logFileExists ? filesize(LogFile::getLogFilePath()) : 0; - - $parameters = [ - 'loglevel' => $this->config->getSystemValue('loglevel', 2), - 'entries' => $entries, - 'entriesremain' => $entriesRemaining, - 'doesLogFileExist' => $logFileExists, - 'logFileSize' => $logFileSize, - 'showLog' => $showLog, - ]; - - return new TemplateResponse('settings', 'admin/logging', $parameters, ''); - } - - /** - * @return string the section ID, e.g. 'sharing' - */ - public function getSection() { - return 'logging'; - } - - /** - * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. - * - * E.g.: 70 - */ - public function getPriority() { - return 0; - } -} diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index a6f9aacccb2..990750848d3 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -332,7 +332,6 @@ class Manager implements IManager { 0 => [new Section('server', $this->l->t('Server settings'), 0)], 5 => [new Section('sharing', $this->l->t('Sharing'), 0)], 45 => [new Section('encryption', $this->l->t('Encryption'), 0)], - 90 => [new Section('logging', $this->l->t('Logging'), 0)], 98 => [new Section('additional', $this->l->t('Additional settings'), 0)], 99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0)], ]; @@ -382,11 +381,6 @@ class Manager implements IManager { $form = new Admin\Sharing($this->config); $forms[$form->getPriority()] = [$form]; } - if($section === 'logging') { - /** @var ISettings $form */ - $form = new Admin\Logging($this->config); - $forms[$form->getPriority()] = [$form]; - } if($section === 'additional') { /** @var ISettings $form */ $form = new Admin\Additional($this->config); diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index 23e0fba902a..e87d201a83b 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -41,63 +41,6 @@ use OCP\IConfig; * @package OC\Settings\Controller */ class LogSettingsController extends Controller { - /** - * @var \OCP\IConfig - */ - private $config; - - /** - * @var \OCP\IL10N - */ - private $l10n; - - /** - * @param string $appName - * @param IRequest $request - * @param IConfig $config - */ - public function __construct($appName, - IRequest $request, - IConfig $config, - IL10N $l10n) { - parent::__construct($appName, $request); - $this->config = $config; - $this->l10n = $l10n; - } - - /** - * set log level for logger - * - * @param int $level - * @return JSONResponse - */ - public function setLogLevel($level) { - if ($level < 0 || $level > 4) { - return new JSONResponse([ - 'message' => (string) $this->l10n->t('log-level out of allowed range'), - ], Http::STATUS_BAD_REQUEST); - } - - $this->config->setSystemValue('loglevel', $level); - return new JSONResponse([ - 'level' => $level, - ]); - } - - /** - * get log entries from logfile - * - * @param int $count - * @param int $offset - * @return JSONResponse - */ - public function getEntries($count=50, $offset=0) { - return new JSONResponse([ - 'data' => \OC\Log\File::getEntries($count, $offset), - 'remain' => count(\OC\Log\File::getEntries(1, $offset + $count)) !== 0, - ]); - } - /** * download logfile * diff --git a/settings/templates/admin/logging.php b/settings/templates/admin/logging.php deleted file mode 100644 index 2f60629c42a..00000000000 --- a/settings/templates/admin/logging.php +++ /dev/null @@ -1,88 +0,0 @@ - - * - * @author Arthur Schiwon - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -/** @var \OCP\IL10N $l */ -/** @var array $_ */ - -$levels = ['Debug', 'Info', 'Warning', 'Error', 'Fatal']; -$levelLabels = [ - $l->t( 'Everything (fatal issues, errors, warnings, info, debug)' ), - $l->t( 'Info, warnings, errors and fatal issues' ), - $l->t( 'Warnings, errors and fatal issues' ), - $l->t( 'Errors and fatal issues' ), - $l->t( 'Fatal issues only' ), -]; - -?> - -
-

t('Log'));?>

- - - - - - - - - - - -
- level]);?> - - app);?> - - message);?> - - time)){ - p(OC_Util::formatDate($entry->time)); - } else { - p($entry->time); - }?> - user) ? p($entry->user) : p('--') ?>
-

t('What to log'));?>

- - 0): ?> - t('Download logfile'));?> - - - - - - (100 * 1024 * 1024)): ?> -
- - t('The logfile is bigger than 100 MB. Downloading it may take some time!')); ?> - - - -
-- 2.39.5