session: fix user info in general log (#34853)

close #34852
pingcap · May 24, 2022 · 85c595c · 85c595c
1 parent b08e89e
commit 85c595c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/parser/auth/auth.go b/parser/auth/auth.go
@@ -15,6 +15,7 @@ package auth
 
 import (
 	"fmt"
+
 	"github.com/pingcap/tidb/parser/format"
 )
 
@@ -62,6 +63,9 @@ func (user *UserIdentity) String() string {
 // It matches the login user.
 func (user *UserIdentity) LoginString() string {
 	// TODO: Escape username and hostname.
+	if user == nil {
+		return ""
+	}
 	return fmt.Sprintf("%s@%s", user.Username, user.Hostname)
 }
 

diff --git a/session/session.go b/session/session.go
@@ -3295,7 +3295,7 @@ func logGeneralQuery(execStmt *executor.ExecStmt, s *session, isPrepared bool) {
 		}
 		logutil.BgLogger().Info("GENERAL_LOG",
 			zap.Uint64("conn", vars.ConnectionID),
-			zap.Stringer("user", vars.User),
+			zap.String("user", vars.User.LoginString()),
 			zap.Int64("schemaVersion", s.GetInfoSchema().SchemaMetaVersion()),
 			zap.Uint64("txnStartTS", vars.TxnCtx.StartTS),
 			zap.Uint64("forUpdateTS", vars.TxnCtx.GetForUpdateTS()),