upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #32660 from susnux/master

Browse source 
Feature: Add loglevel exported JS OC.config object
This commit is contained in:
Vincent Petry 2022-06-10 15:31:36 +02:00 committed by GitHub
commit 87b04753d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/config.sample.php
View file

@ -888,6 +888,15 @@ $CONFIG = [
*/
'loglevel' => 2,
/**
* Loglevel used by the frontend to start logging at. The same values as
* for ``loglevel`` can be used. If not set it defaults to the value
* configured for ``loglevel`` or Warning if that is not set either.
*
* Defaults to ``2``
*/
'loglevel_frontend' => 2,
/**
* If you maintain different instances and aggregate the logs, you may want
* to distinguish between them. ``syslog_tag`` can be set per instance

4
lib/private/Template/JSConfigHelper.php
View file

@ -47,6 +47,7 @@ use OCP\IInitialStateService;
use OCP\IL10N;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\ILogger;
use OCP\IUser;
use OCP\User\Backend\IPasswordConfirmationBackend;
use OCP\Util;
@ -176,6 +177,9 @@ class JSConfigHelper {
'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
'blacklist_files_regex' => FileInfo::BLACKLIST_FILES_REGEX,
'loglevel' => $this->config->getSystemValue('loglevel_frontend',
$this->config->getSystemValue('loglevel', ILogger::WARN)
),
];
$array = [