github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1975 from fcying/access_log_add_detour_tag 

check detour tag size
pull/1981/head
Kslr 2019-10-27 23:29:36 +08:00 committed by GitHub
parent 876e2fcc73 1cc7702c51
commit 8a36846869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/dispatcher/default.go
View File

@ -13,8 +13,8 @@ import (
"v2ray.com/core" "v2ray.com/core"
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/log" "v2ray.com/core/common/log"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol" "v2ray.com/core/common/protocol"
"v2ray.com/core/common/session" "v2ray.com/core/common/session"
"v2ray.com/core/features/outbound" "v2ray.com/core/features/outbound"
@ -284,7 +284,11 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport.
accessMessage := log.AccessMessageFromContext(ctx) accessMessage := log.AccessMessageFromContext(ctx)
if accessMessage != nil { if accessMessage != nil {
accessMessage.Detour = "[" + handler.Tag() + "]" if len(handler.Tag()) > 0 {
accessMessage.Detour = handler.Tag()
} else {
accessMessage.Detour = ""
}
log.Record(accessMessage) log.Record(accessMessage)
} }

9
common/log/access.go
View File

@ -26,7 +26,7 @@ type AccessMessage struct {
Status AccessStatus Status AccessStatus
Reason interface{} Reason interface{}
Email string Email string
Detour interface{} Detour string
} }
func (m *AccessMessage) String() string { func (m *AccessMessage) String() string {
@ -37,8 +37,11 @@ func (m *AccessMessage) String() string {
builder.WriteByte(' ') builder.WriteByte(' ')
builder.WriteString(serial.ToString(m.To)) builder.WriteString(serial.ToString(m.To))
builder.WriteByte(' ') builder.WriteByte(' ')
builder.WriteString(serial.ToString(m.Detour)) if len(m.Detour) > 0 {
builder.WriteByte(' ') builder.WriteByte('[')
builder.WriteString(m.Detour)
builder.WriteString("] ")
}
builder.WriteString(serial.ToString(m.Reason)) builder.WriteString(serial.ToString(m.Reason))
if len(m.Email) > 0 { if len(m.Email) > 0 {