瀏覽代碼

Optimized log (#121)

eMeab 4 年之前
父節點
當前提交
be9421fedf
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      app/dispatcher/default.go

+ 7 - 1
app/dispatcher/default.go

@@ -263,9 +263,11 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport.
 		skipRoutePick = content.SkipRoutePick
 		skipRoutePick = content.SkipRoutePick
 	}
 	}
 
 
+	var inTag string
 	if d.router != nil && !skipRoutePick {
 	if d.router != nil && !skipRoutePick {
 		if route, err := d.router.PickRoute(routing_session.AsRoutingContext(ctx)); err == nil {
 		if route, err := d.router.PickRoute(routing_session.AsRoutingContext(ctx)); err == nil {
 			tag := route.GetOutboundTag()
 			tag := route.GetOutboundTag()
+			inTag = route.GetInboundTag()
 			if h := d.ohm.GetHandler(tag); h != nil {
 			if h := d.ohm.GetHandler(tag); h != nil {
 				newError("taking detour [", tag, "] for [", destination, "]").WriteToLog(session.ExportIDToError(ctx))
 				newError("taking detour [", tag, "] for [", destination, "]").WriteToLog(session.ExportIDToError(ctx))
 				handler = h
 				handler = h
@@ -290,7 +292,11 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport.
 
 
 	if accessMessage := log.AccessMessageFromContext(ctx); accessMessage != nil {
 	if accessMessage := log.AccessMessageFromContext(ctx); accessMessage != nil {
 		if tag := handler.Tag(); tag != "" {
 		if tag := handler.Tag(); tag != "" {
-			accessMessage.Detour = tag
+			if inTag != "" {
+				accessMessage.Detour = inTag + " -> " + tag
+			} else {
+				accessMessage.Detour = tag
+			}
 		}
 		}
 		log.Record(accessMessage)
 		log.Record(accessMessage)
 	}
 	}