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

executor: change to structured slow log for friendly JSON output #4657

Merged
merged 9 commits into from
Sep 29, 2017
Merged

executor: change to structured slow log for friendly JSON output #4657

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b405404
structured slow log
breezewish Sep 27, 2017
c13f709
change query to slow-query for easier grep
breezewish Sep 27, 2017
f573abf
Merge branch 'master' into wenxuan/structured-slow-log
coocood Sep 27, 2017
35ef1a0
grumble
breezewish Sep 27, 2017
705b314
Merge branch 'master' into wenxuan/structured-slow-log
shenli Sep 29, 2017
81f76e3
add a type field for easier grep
breezewish Sep 29, 2017
ab79e57
Merge branch 'master' into wenxuan/structured-slow-log
winoros Sep 29, 2017
a432ad6
Merge branch 'master' into wenxuan/structured-slow-log
shenli Sep 29, 2017
12c94eb
Merge branch 'master' into wenxuan/structured-slow-log
shenli Sep 29, 2017
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
9 changes: 7 additions & 2 deletions executor/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,15 @@ func (a *statement) logSlowQuery() {
sql = sql[:cfg.Log.QueryLogMaxLen] + fmt.Sprintf("(len:%d)", len(sql))
}
connID := a.ctx.GetSessionVars().ConnectionID
logEntry := log.WithFields(log.Fields{
"connectionId": connID,
"costTime": costTime,
"sql": sql,
})
if costTime < time.Duration(cfg.Log.SlowThreshold)*time.Millisecond {
log.Debugf("[%d][TIME_QUERY] %v %s", connID, costTime, sql)
logEntry.Debugf("query")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change TIME_QUERY to query ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found it actually logs all queries, not just for slow queries.

} else {
log.Warnf("[%d][TIME_QUERY] %v %s", connID, costTime, sql)
logEntry.Infof("slow-query")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use Warnf?

}
}

Expand Down