diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-07-25 11:41:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 11:41:24 +0200 |
| commit | 4ad0c383ade90eb2f339daa392828e145f1a3b6b (patch) | |
| tree | 0c223080b36bbff7a2aaeef3bb5db2d97c408dee /settings | |
| parent | 6a25e5f0eb56d3c712a2025a2df590a6da651dab (diff) | |
| parent | 61a1d56d2784d407ac0922ea1fcd382b21f3df06 (diff) | |
| download | nextcloud-server-4ad0c383ade90eb2f339daa392828e145f1a3b6b.tar.gz nextcloud-server-4ad0c383ade90eb2f339daa392828e145f1a3b6b.zip | |
Merge pull request #523 from Faldon/master
Renamed file logging
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/LogSettingsController.php | 6 | ||||
| -rw-r--r-- | settings/admin.php | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index ce4913c2478..23e0fba902a 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -93,8 +93,8 @@ class LogSettingsController extends Controller { */ public function getEntries($count=50, $offset=0) { return new JSONResponse([ - 'data' => \OC\Log\Owncloud::getEntries($count, $offset), - 'remain' => count(\OC\Log\Owncloud::getEntries(1, $offset + $count)) !== 0, + 'data' => \OC\Log\File::getEntries($count, $offset), + 'remain' => count(\OC\Log\File::getEntries(1, $offset + $count)) !== 0, ]); } @@ -106,7 +106,7 @@ class LogSettingsController extends Controller { * @return StreamResponse */ public function download() { - $resp = new StreamResponse(\OC\Log\Owncloud::getLogFilePath()); + $resp = new StreamResponse(\OC\Log\File::getLogFilePath()); $resp->addHeader('Content-Type', 'application/octet-stream'); $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"'); return $resp; diff --git a/settings/admin.php b/settings/admin.php index 11d3a3f40db..a458c813c11 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -44,12 +44,13 @@ OC_Util::addScript('files', 'jquery.fileupload'); \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Admin::loadAdditionalScripts'); -$showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud'); +$logType = \OC::$server->getConfig()->getSystemValue('log_type', 'file'); +$showLog = ($logType === 'file' || $logType === 'owncloud'); $numEntriesToLoad = 3; -$entries = \OC\Log\Owncloud::getEntries($numEntriesToLoad + 1); +$entries = \OC\Log\File::getEntries($numEntriesToLoad + 1); $entriesRemaining = count($entries) > $numEntriesToLoad; $entries = array_slice($entries, 0, $numEntriesToLoad); -$logFilePath = \OC\Log\Owncloud::getLogFilePath(); +$logFilePath = \OC\Log\File::getLogFilePath(); $doesLogFileExist = file_exists($logFilePath); $logFileSize = 0; if($doesLogFileExist) { |