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

add session id for sql log

This commit is contained in:
xormplus 2017-10-23 18:49:25 +08:00
parent 109cb1a7d0
commit dded1f3253
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine.go
View File

@ -290,12 +290,12 @@ func (engine *Engine) Ping() error {
}
// logging sql
func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) {
func (engine *Engine) logSQL(session *Session, sqlStr string, sqlArgs ...interface{}) {
if engine.showSQL && !engine.showExecTime {
if len(sqlArgs) > 0 {
engine.logger.Infof("[SQL] %v %#v", sqlStr, sqlArgs)
engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, sqlArgs)
} else {
engine.logger.Infof("[SQL] %v", sqlStr)
engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
}
}
}
@ -1532,7 +1532,8 @@ func (engine *Engine) Import(r io.Reader) ([]sql.Result, error) {
for scanner.Scan() {
query := strings.Trim(scanner.Text(), " \t\n\r")
if len(query) > 0 {
engine.logSQL(query)
// engine.logSQL(query)
engine.logger.Infof("[SQL] %v", query)
result, err := engine.DB().Exec(query)
results = append(results, result)
if err != nil {

2
session.go
View File

@ -816,7 +816,7 @@ func (session *Session) slice2Bean(scanResults []interface{}, fields []string, b
func (session *Session) saveLastSQL(sql string, args ...interface{}) {
session.lastSQL = sql
session.lastSQLArgs = args
session.engine.logSQL(sql, args...)
session.engine.logSQL(session, sql, args...)
}
// LastSQL returns last query information

16
session_raw.go
View File

@ -32,16 +32,16 @@ func (session *Session) queryRows(sqlStr string, args ...interface{}) (*core.Row
defer func() {
execDuration := time.Since(b4ExecTime)
if len(args) > 0 {
session.engine.logger.Infof("[SQL] %s %#v - took: %v", sqlStr, args, execDuration)
session.engine.logger.Infof("[SQL][Session ID : %p] %s %#v - took: %v", session, sqlStr, args, execDuration)
} else {
session.engine.logger.Infof("[SQL] %s - took: %v", sqlStr, execDuration)
session.engine.logger.Infof("[SQL][Session ID : %p] %s - took: %v", session, sqlStr, execDuration)
}
}()
} else {
if len(args) > 0 {
session.engine.logger.Infof("[SQL] %v %#v", sqlStr, args)
session.engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, args)
} else {
session.engine.logger.Infof("[SQL] %v", sqlStr)
session.engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
}
}
}
@ -159,16 +159,16 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
defer func() {
execDuration := time.Since(b4ExecTime)
if len(args) > 0 {
session.engine.logger.Infof("[SQL] %s %#v - took: %v", sqlStr, args, execDuration)
session.engine.logger.Infof("[SQL][Session ID : %p] %s %#v - took: %v", session, sqlStr, args, execDuration)
} else {
session.engine.logger.Infof("[SQL] %s - took: %v", sqlStr, execDuration)
session.engine.logger.Infof("[SQL][Session ID : %p] %s - took: %v", session, sqlStr, execDuration)
}
}()
} else {
if len(args) > 0 {
session.engine.logger.Infof("[SQL] %v %#v", sqlStr, args)
session.engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, args)
} else {
session.engine.logger.Infof("[SQL] %v", sqlStr)
session.engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
}
}
}