HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'log_context_add_db_info'

This commit is contained in:
yong.an 2020-07-13 18:24:42 +08:00
parent 372a2403e8 f3ca093478
commit 7a1a1c04be
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
log/logger_context.go
View File

@ -42,6 +42,7 @@ var (
// enumerate all the context keys // enumerate all the context keys
var ( var (
SessionIDKey = "__xorm_session_id" SessionIDKey = "__xorm_session_id"
SessionKey = "__xorm_session_key"
SessionShowSQLKey = "__xorm_show_sql" SessionShowSQLKey = "__xorm_show_sql"
) )

11
session.go
View File

@ -100,8 +100,15 @@ func newSessionID() string {
} }
func newSession(engine *Engine) *Session { func newSession(engine *Engine) *Session {
var ctx context.Context
if engine.logSessionID {
ctx = context.WithValue(engine.defaultContext, log.SessionIDKey, newSessionID())
} else {
ctx = engine.defaultContext
}
session := &Session{ session := &Session{
ctx: engine.defaultContext, ctx: ctx,
engine: engine, engine: engine,
tx: nil, tx: nil,
statement: statements.NewStatement( statement: statements.NewStatement(
@ -130,7 +137,7 @@ func newSession(engine *Engine) *Session {
sessionType: engineSession, sessionType: engineSession,
} }
if engine.logSessionID { if engine.logSessionID {
session.ctx = context.WithValue(session.ctx, log.SessionIDKey, session) session.ctx = context.WithValue(session.ctx, log.SessionKey, session)
} }
return session return session
} }