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

add session to context

This commit is contained in:
yong.an 2020-07-13 18:23:57 +08:00
parent 3fb2294415
commit f3ca093478
2 changed files with 3 additions and 4 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"
) )

6
session.go
View File

@ -101,10 +101,8 @@ func newSessionID() string {
func newSession(engine *Engine) *Session { func newSession(engine *Engine) *Session {
var ctx context.Context var ctx context.Context
var sessionID string
if engine.logSessionID { if engine.logSessionID {
sessionID = newSessionID() ctx = context.WithValue(engine.defaultContext, log.SessionIDKey, newSessionID())
ctx = context.WithValue(engine.defaultContext, log.SessionIDKey, sessionID)
} else { } else {
ctx = engine.defaultContext ctx = engine.defaultContext
} }
@ -139,7 +137,7 @@ func newSession(engine *Engine) *Session {
sessionType: engineSession, sessionType: engineSession,
} }
if engine.logSessionID { if engine.logSessionID {
session.ctx = context.WithValue(session.ctx, sessionID, session) session.ctx = context.WithValue(session.ctx, log.SessionKey, session)
} }
return session return session
} }