Browse Source

Merge pull request #1975 from fcying/access_log_add_detour_tag

check detour tag size
Kslr 6 years ago
parent
commit
8a36846869
2 changed files with 12 additions and 5 deletions
  1. 6 2
      app/dispatcher/default.go
  2. 6 3
      common/log/access.go

+ 6 - 2
app/dispatcher/default.go

@@ -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)
 	}
 	}
 
 

+ 6 - 3
common/log/access.go

@@ -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))
-	builder.WriteByte(' ')
+	if len(m.Detour) > 0 {
+		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 {