Skip to content

Commit

Permalink
Remove the default console logger when it is not set in the configura…
Browse files Browse the repository at this point in the history
…tion (#602) (#960)

* Remove the default console logger when it is not set in the configuration

* Added comment to new function (lint failure)

* update based on PR comments (code style)

* code style fix (thanks bkcsoft)

* check if logger exists based on the l.outputs (like in l.DelLogger) instead of adapter, otherwise panic when reinstalling gitea (since the output adapter still exist, without outputs)
  • Loading branch information
lunny authored Feb 18, 2017
1 parent 61cdc32 commit 3121a7a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
11 changes: 11 additions & 0 deletions modules/log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ func NewLogger(bufLen int64, mode, config string) {
}
}

// DelLogger removes loggers that are for the given mode
func DelLogger(mode string) error {
for _, l := range loggers {
if _, ok := l.outputs[mode]; ok {
return l.DelLogger(mode)
}
}
Trace("Log adapter %s not found, no need to delete", mode)
return nil
}

// NewGitLogger create a logger for git
// FIXME: use same log level as other loggers.
func NewGitLogger(logPath string) {
Expand Down
10 changes: 10 additions & 0 deletions modules/setting/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,16 @@ func newLogService() {
LogModes = strings.Split(Cfg.Section("log").Key("MODE").MustString("console"), ",")
LogConfigs = make([]string, len(LogModes))

useConsole := false
for _, mode := range LogModes {
if mode == "console" {
useConsole = true
}
}
if (!useConsole) {
log.DelLogger("console")
}

for i, mode := range LogModes {
mode = strings.TrimSpace(mode)

Expand Down

0 comments on commit 3121a7a

Please sign in to comment.