Do not replace logger when adding hooks
Because the logger was incorrectly replaced while adding hooks, log output did not include the version and instance ids. The main issue was the the logrus.Entry was replaced with the logger, which included no context. Replacing the logger on the context is not necessary when configuring hooks since we are configuring the contexts logger directly. Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
parent
984037f7fc
commit
0b89cdfcd4
1 changed files with 8 additions and 2 deletions
|
@ -298,7 +298,14 @@ func (app *App) configureRedis(configuration *configuration.Configuration) {
|
|||
|
||||
// configureLogHook prepares logging hook parameters.
|
||||
func (app *App) configureLogHook(configuration *configuration.Configuration) {
|
||||
logger := ctxu.GetLogger(app).(*log.Entry).Logger
|
||||
entry, ok := ctxu.GetLogger(app).(*log.Entry)
|
||||
if !ok {
|
||||
// somehow, we are not using logrus
|
||||
return
|
||||
}
|
||||
|
||||
logger := entry.Logger
|
||||
|
||||
for _, configHook := range configuration.Log.Hooks {
|
||||
if !configHook.Disabled {
|
||||
switch configHook.Type {
|
||||
|
@ -318,7 +325,6 @@ func (app *App) configureLogHook(configuration *configuration.Configuration) {
|
|||
}
|
||||
}
|
||||
}
|
||||
app.Context = ctxu.WithLogger(app.Context, logger)
|
||||
}
|
||||
|
||||
func (app *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
|
|
Loading…
Reference in a new issue