Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

session: fix user info in general log #34853

Merged
merged 11 commits into from
May 24, 2022
Merged

session: fix user info in general log #34853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
851dedb
session: fix user info in general log
jackysp May 20, 2022
64c6e57
Merge branch 'master' into fix_general_log
hawkingrei May 20, 2022
16ce9f3
Merge branch 'master' into fix_general_log
ti-chi-bot May 20, 2022
20528a6
Merge branch 'master' into fix_general_log
ti-chi-bot May 20, 2022
2b9b7f3
Merge branch 'master' into fix_general_log
ti-chi-bot May 21, 2022
eb27ab7
Merge branch 'master' into fix_general_log
ti-chi-bot May 22, 2022
e856f4c
Merge branch 'master' into fix_general_log
ti-chi-bot May 23, 2022
8eb45c3
fix ci
jackysp May 23, 2022
2f3a6e7
Merge branch 'master' into fix_general_log
Defined2014 May 23, 2022
dfd4266
Merge branch 'master' into fix_general_log
ti-chi-bot May 24, 2022
5b3d82b
Merge branch 'master' into fix_general_log
ti-chi-bot May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions parser/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package auth

import (
"fmt"

"github.com/pingcap/tidb/parser/format"
)

Expand Down Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down