Переглянути джерело

add session id for sql log

xormplus 7 роки тому
батько
коміт
d999bca3d6
4 змінених файлів з 15 додано та 14 видалено
  1. 5 4
      engine.go
  2. 1 1
      session.go
  3. 1 1
      session_plus.go
  4. 8 8
      session_raw.go

+ 5 - 4
engine.go

@@ -329,12 +329,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][%v] %v %#v", session, sqlStr, sqlArgs)
 		} else {
-			engine.logger.Infof("[SQL] %v", sqlStr)
+			engine.logger.Infof("[SQL][%v] %v", session, sqlStr)
 		}
 	}
 }
@@ -1546,7 +1546,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 {

+ 1 - 1
session.go

@@ -832,7 +832,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

+ 1 - 1
session_plus.go

@@ -760,7 +760,7 @@ func (session *Session) queryPreprocessByMap(sqlStr *string, paramMap interface{
 	}
 
 	*sqlStr = query
-	session.engine.logSQL(*sqlStr, paramMap)
+	session.engine.logSQL(session, *sqlStr, paramMap)
 }
 
 func (session *Session) Sqls(sqls interface{}, parmas ...interface{}) *SqlsExecutor {

+ 8 - 8
session_raw.go

@@ -33,16 +33,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][%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][%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][%p] %v %#v", session, sqlStr, args)
 			} else {
-				session.engine.logger.Infof("[SQL] %v", sqlStr)
+				session.engine.logger.Infof("[SQL][%p] %v", session, sqlStr)
 			}
 		}
 	}
@@ -275,16 +275,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][%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][%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][%p] %v %#v", session, sqlStr, args)
 			} else {
-				session.engine.logger.Infof("[SQL] %v", sqlStr)
+				session.engine.logger.Infof("[SQL][%p] %v", session, sqlStr)
 			}
 		}
 	}