git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

Fix logging documentation (#6904)

Browse source 
* ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG

* Allow DISABLE_ROUTER_LOG to be set in the [log] section
This commit is contained in:
zeripath 2019-05-11 10:13:57 +01:00 • committed by GitHub
commit e3166744fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/content/doc/advanced/logging-documentation.en-us.md
View file

@ -66,7 +66,7 @@ multiple subloggers that will log to files.
By default Macaron will log to its own go `log` instance. This writes
to `os.Stdout`. You can redirect this log to a Gitea configurable logger
through setting the `ENABLE_MACARON_REDIRECT` setting in the `[log]`
through setting the `REDIRECT_MACARON_LOG` setting in the `[log]`
section which you can configure the outputs of by setting the `MACARON`
value in the `[log]` section of the configuration. `MACARON` defaults
to `file` if unset.
@ -89,7 +89,7 @@ log using the value: `MACARON = ,`
There are two types of Router log. By default Macaron send its own
router log which will be directed to Macaron's go `log`, however if you
`ENABLE_MACARON_REDIRECT` you will enable Gitea's router log. You can
`REDIRECT_MACARON_LOG` you will enable Gitea's router log. You can
disable both types of Router log by setting `DISABLE_ROUTER_LOG`.
If you enable the redirect, you can configure the outputs of this

2
modules/setting/log.go
View file

@ -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()