summaryrefslogtreecommitdiffstats
path: root/modules/setting/setting.go
diff options
context:
space:
mode:
authora1012112796 <1012112796@qq.com>2021-03-29 03:08:19 +0800
committerGitHub <noreply@github.com>2021-03-28 20:08:19 +0100
commit3273fb9af18b9356d3c472bf23e9fbb8c7d681f3 (patch)
tree1860c24521269946d558ec60d521fc91a04f9c39 /modules/setting/setting.go
parent82d1a7fb17ea549b17ef30711e0fa7e136acb880 (diff)
downloadgitea-3273fb9af18b9356d3c472bf23e9fbb8c7d681f3.tar.gz
gitea-3273fb9af18b9356d3c472bf23e9fbb8c7d681f3.zip
use level config in main section when subsection not set level (#15176)
in previouse if a log subsetcion not set level it will use ``info`` as default value. this pr will make default value (``[log] -> LEVEL``) useable. example config: ```INI [log] MODE = console LEVEL = Trace [log.console] LEVEL = STDERR = false ``` previous result: ```JSON // console: { "level": "info", ................... } ``` after change: ```JSON // console: { "level": "track", ................... } ``` Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules/setting/setting.go')
-rw-r--r--modules/setting/setting.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 9d27a5d743..6a9868713f 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -304,7 +304,7 @@ var (
}
// Log settings
- LogLevel string
+ LogLevel log.Level
StacktraceLogLevel string
LogRootPath string
DisableRouterLog bool
@@ -553,7 +553,7 @@ func NewContext() {
}
homeDir = strings.ReplaceAll(homeDir, "\\", "/")
- LogLevel = getLogLevel(Cfg.Section("log"), "LEVEL", "Info")
+ LogLevel = getLogLevel(Cfg.Section("log"), "LEVEL", log.INFO)
StacktraceLogLevel = getStacktraceLogLevel(Cfg.Section("log"), "STACKTRACE_LEVEL", "None")
LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(AppWorkPath, "log"))
forcePathSeparator(LogRootPath)