summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2016-11-21 17:17:02 +0100
committerGitHub <noreply@github.com>2016-11-21 17:17:02 +0100
commitcd24010fa4199e8ef39b831f6f27138504a9c9d6 (patch)
tree01815b38c27a4d876a015aa028feca61d479c3bc /settings
parentefdef8f801bd33b5c2e4d982947a4ff41e2514ab (diff)
parent0048b3aa2e70b2e9d2f1fbb6adb82af31b13f95a (diff)
downloadnextcloud-server-cd24010fa4199e8ef39b831f6f27138504a9c9d6.tar.gz
nextcloud-server-cd24010fa4199e8ef39b831f6f27138504a9c9d6.zip
Merge pull request #2214 from nextcloud/remove-logging
remove old logging section
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/LogSettingsController.php57
-rw-r--r--settings/templates/admin/logging.php88
2 files changed, 0 insertions, 145 deletions
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
@@ -42,63 +42,6 @@ use OCP\IConfig;
*/
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
*
* @NoCSRFRequired
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 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/** @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' ),
-];
-
-?>
-
-<div class="section" id="log-section">
- <h2><?php p($l->t('Log'));?></h2>
- <?php if ($_['showLog'] && $_['doesLogFileExist']): ?>
- <table id="log" class="grid">
- <?php foreach ($_['entries'] as $entry): ?>
- <tr>
- <td>
- <?php p($levels[$entry->level]);?>
- </td>
- <td>
- <?php p($entry->app);?>
- </td>
- <td class="log-message">
- <?php p($entry->message);?>
- </td>
- <td class="date">
- <?php if(is_int($entry->time)){
- p(OC_Util::formatDate($entry->time));
- } else {
- p($entry->time);
- }?>
- </td>
- <td><?php isset($entry->user) ? p($entry->user) : p('--') ?></td>
- </tr>
- <?php endforeach;?>
- </table>
- <p><?php p($l->t('What to log'));?> <select name='loglevel' id='loglevel'>
- <?php for ($i = 0; $i < 5; $i++):
- $selected = '';
- if ($i == $_['loglevel']):
- $selected = 'selected="selected"';
- endif; ?>
- <option value='<?php p($i)?>' <?php p($selected) ?>><?php p($levelLabels[$i])?></option>
- <?php endfor;?>
- </select></p>
-
- <?php if ($_['logFileSize'] > 0): ?>
- <a href="<?php print_unescaped(OC::$server->getURLGenerator()->linkToRoute('settings.LogSettings.download')); ?>" class="button" id="downloadLog"><?php p($l->t('Download logfile'));?></a>
- <?php endif; ?>
- <?php if ($_['entriesremain']): ?>
- <input id="moreLog" type="button" value="<?php p($l->t('More'));?>...">
- <input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
- <?php endif; ?>
- <?php if ($_['logFileSize'] > (100 * 1024 * 1024)): ?>
- <br>
- <em>
- <?php p($l->t('The logfile is bigger than 100 MB. Downloading it may take some time!')); ?>
- </em>
- <?php endif; ?>
- <?php endif; ?>
-</div>