From 56881e64a9c77d19c862bf203ccf31a22368032d Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 9 Jul 2020 06:44:26 +0000 Subject: [PATCH] put ContextLogger in higher priority (#1656) Merge branch 'master' into logger-priority Merge branch 'master' into logger-priority Merge branch 'master' into logger-priority Merge branch 'master' into logger-priority put ContextLogger in higher priority SetLogger use `Logger` when give a interface which implements both ContextLogger and Logger. Because Go's type `switch` uses prior `case`. Co-authored-by: Lunny Xiao Co-authored-by: MURAOKA Taro Reviewed-on: https://gitea.com/xorm/xorm/pulls/1656 --- engine.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine.go b/engine.go index 8b137b27..4159a7b2 100644 --- a/engine.go +++ b/engine.go @@ -143,10 +143,10 @@ func (engine *Engine) Logger() log.ContextLogger { func (engine *Engine) SetLogger(logger interface{}) { var realLogger log.ContextLogger switch t := logger.(type) { - case log.Logger: - realLogger = log.NewLoggerAdapter(t) case log.ContextLogger: realLogger = t + case log.Logger: + realLogger = log.NewLoggerAdapter(t) } engine.logger = realLogger engine.DB().Logger = realLogger