1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-17 08:19:57 -04:00

Merge pull request #1975 from fcying/access_log_add_detour_tag

check detour tag size
This commit is contained in:
Kslr
2019-10-27 23:29:36 +08:00
committed by GitHub
2 changed files with 12 additions and 5 deletions

View File

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

View File

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