Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

Update docs and comments to remove macaron (#14491)

Browse source
This commit is contained in:
Lunny Xiao 2021-01-29 23:35:30 +08:00 • committed by GitHub
parent 25b6255b92
commit 0cd87d64ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 32 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/setting/log.go
View file

@ -273,7 +273,7 @@ func newRouterLogService() {
// Allow [log] DISABLE_ROUTER_LOG to override [server] DISABLE_ROUTER_LOG
DisableRouterLog = Cfg.Section("log").Key("DISABLE_ROUTER_LOG").MustBool(DisableRouterLog)
if !DisableRouterLog && RedirectMacaronLog {
if !DisableRouterLog {
options := newDefaultLogOptions()
options.filename = filepath.Join(LogRootPath, "router.log")
options.flags = "date,time" // For the router we don't want any prefixed flags

2
modules/setting/setting.go
View file

@ -288,7 +288,6 @@ var (
LogLevel string
StacktraceLogLevel string
LogRootPath string
RedirectMacaronLog bool
DisableRouterLog bool
RouterLogLevel log.Level
RouterLogMode string
@ -539,7 +538,6 @@ func NewContext() {
StacktraceLogLevel = getStacktraceLogLevel(Cfg.Section("log"), "STACKTRACE_LEVEL", "None")
LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(AppWorkPath, "log"))
forcePathSeparator(LogRootPath)
RedirectMacaronLog = Cfg.Section("log").Key("REDIRECT_MACARON_LOG").MustBool(false)
RouterLogLevel = log.FromString(Cfg.Section("log").Key("ROUTER_LOG_LEVEL").MustString("Info"))
sec := Cfg.Section("server")