diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-06-10 16:31:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 16:31:36 +0300 |
| commit | 87b04753d2ce24dba57da835cfabfb5accb43d92 (patch) | |
| tree | f61a189bfb2ef1efb88324f7d87d95c4137d478e | |
| parent | 4bc469bf809e9f67f08e08c20dc062357060b3df (diff) | |
| parent | 1da424595f2eef2ee341081f9398e6aac6d842f3 (diff) | |
Merge pull request #32660 from susnux/master
Feature: Add loglevel exported JS OC.config object
| -rw-r--r-- | config/config.sample.php | 9 | ||||
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 4cb19c8d9e9..b51afd32ccc 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -889,6 +889,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 * with a unique id. Only available if ``log_type`` is set to ``syslog`` or diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index a7b9fd35fd8..5f23b471837 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -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 = [ |