Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-21 11:57:02 +00:00
Code Releases Activity

add more information for access log

Browse Source 
Former-commit-id: 60517837c5bfdb2d879909c4b413e83cbd10321a
This commit is contained in:
Chengyumeng
2018-03-26 15:50:33 +08:00
parent 66d367b255
commit edc24d529f
3 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
middleware/logger/logger.go
View File

@@ -70,19 +70,37 @@ func (l *requestLoggerMiddleware) ServeHTTP(ctx context.Context) {
}
var message interface{}
if ctxKey := l.config.MessageContextKey; ctxKey != "" {
message = ctx.Values().Get(ctxKey)
if ctxKeys := l.config.MessageContextKeys; len(ctxKeys) > 0 {
for _, key := range ctxKeys {
msg := ctx.Values().Get(key)
if message == nil {
message = msg
} else {
message = fmt.Sprintf(" %v %v", message, msg)
}
}
}
var headerMessage interface{}
if headerKeys := l.config.MessageHeaderKeys; len(headerKeys) > 0 {
for _, key := range headerKeys {
msg := ctx.GetHeader(key)
if headerMessage == nil {
headerMessage = msg
} else {
headerMessage = fmt.Sprintf(" %v %v", headerMessage, msg)
}
}
}
// print the logs
if logFunc := l.config.LogFunc; logFunc != nil {
logFunc(endTime, latency, status, ip, method, path, message)
logFunc(endTime, latency, status, ip, method, path, message, headerMessage)
return
}
if l.config.Columns {
endTimeFormatted := endTime.Format("2006/01/02 - 15:04:05")
output := Columnize(endTimeFormatted, latency, status, ip, method, path, message)
output := Columnize(endTimeFormatted, latency, status, ip, method, path, message, headerMessage)
ctx.Application().Logger().Printer.Output.Write([]byte(output))
return
}
@@ -91,12 +109,16 @@ func (l *requestLoggerMiddleware) ServeHTTP(ctx context.Context) {
if message != nil {
line += fmt.Sprintf(" %v", message)
}
if headerMessage != nil {
line += fmt.Sprintf(" %v", headerMessage)
}
ctx.Application().Logger().Info(line)
}
// Columnize formats the given arguments as columns and returns the formatted output,
// note that it appends a new line to the end.
func Columnize(nowFormatted string, latency time.Duration, status, ip, method, path string, message interface{}) string {
func Columnize(nowFormatted string, latency time.Duration, status, ip, method, path string, message interface{}, headerMessage interface{}) string {
titles := "Time | Status | Latency | IP | Method | Path"
line := fmt.Sprintf("%s | %v | %4v | %s | %s | %s", nowFormatted, status, latency, ip, method, path)
@@ -105,6 +127,11 @@ func Columnize(nowFormatted string, latency time.Duration, status, ip, method, p
line += fmt.Sprintf(" | %v", message)
}
if headerMessage != nil {
titles += " | HeaderMessage"
line += fmt.Sprintf(" | %v", headerMessage)
}
outputC := []string{
titles,
line,