diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-01-29 23:35:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 16:35:30 +0100 |
| commit | 0cd87d64ff8bb40520877d3a217363de299f4531 (patch) | |
| tree | d2ec167aea8f5b2ff673b13ba8be98a275d942ab /modules/setting | |
| parent | 25b6255b924c30a2bab066c0465d146a34021245 (diff) | |
| download | gitea-0cd87d64ff8bb40520877d3a217363de299f4531.tar.gz gitea-0cd87d64ff8bb40520877d3a217363de299f4531.zip | |
Update docs and comments to remove macaron (#14491)
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/log.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/setting/log.go b/modules/setting/log.go index daa449a5ca..9fe2d5bda3 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -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 diff --git a/modules/setting/setting.go b/modules/setting/setting.go index f69dd11ceb..dd38f5be45 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -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") |