summaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-05-11 10:13:57 +0100
committerGitHub <noreply@github.com>2019-05-11 10:13:57 +0100
commite3166744fef607c6623f48d3d53351d9553d81ba (patch)
tree935fdbc192c2b35761d7785d97487ed199d4644c /modules/setting
parentf378cb572a73aa826a18f40c28cfcd4cd1e661fc (diff)
downloadgitea-e3166744fef607c6623f48d3d53351d9553d81ba.tar.gz
gitea-e3166744fef607c6623f48d3d53351d9553d81ba.zip
Fix logging documentation (#6904)
* ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG * Allow DISABLE_ROUTER_LOG to be set in the [log] section
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/log.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/setting/log.go b/modules/setting/log.go
index aafb4b3725..cd2c5cc8c1 100644
--- a/modules/setting/log.go
+++ b/modules/setting/log.go
@@ -211,6 +211,8 @@ func newAccessLogService() {
func newRouterLogService() {
Cfg.Section("log").Key("ROUTER").MustString("console")
+ // Allow [log] DISABLE_ROUTER_LOG to override [server] DISABLE_ROUTER_LOG
+ DisableRouterLog = Cfg.Section("log").Key("DISABLE_ROUTER_LOG").MustBool(DisableRouterLog)
if !DisableRouterLog && RedirectMacaronLog {
options := newDefaultLogOptions()