diff --git a/chain/route.go b/chain/route.go index 2ac38763..76b7b585 100644 --- a/chain/route.go +++ b/chain/route.go @@ -38,7 +38,7 @@ func (*defaultRoute) Dial(ctx context.Context, network, address string, opts ... netd := dialer.Dialer{ Interface: options.Interface, Netns: options.Netns, - Logger: options.Logger, + Log: options.Logger, } if options.SockOpts != nil { netd.Mark = options.SockOpts.Mark diff --git a/internal/net/dialer/dialer.go b/internal/net/dialer/dialer.go index 85c1b15a..b9a14ff6 100644 --- a/internal/net/dialer/dialer.go +++ b/internal/net/dialer/dialer.go @@ -28,7 +28,7 @@ type Dialer struct { Netns string Mark int DialFunc func(ctx context.Context, network, addr string) (net.Conn, error) - Logger logger.Logger + Log logger.Logger } func (d *Dialer) Dial(ctx context.Context, network, addr string) (conn net.Conn, err error) { @@ -36,7 +36,7 @@ func (d *Dialer) Dial(ctx context.Context, network, addr string) (conn net.Conn, d = DefaultNetDialer } - log := d.Logger + log := d.Log if log == nil { log = logger.Default() } diff --git a/listener/mws/listener.go b/listener/mws/listener.go index 7155c642..4913404a 100644 --- a/listener/mws/listener.go +++ b/listener/mws/listener.go @@ -185,7 +185,7 @@ func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) { return } - ctx := r.Context() + ctx := context.Background() if cc, ok := conn.NetConn().(xctx.Context); ok { if cv := cc.Context(); cv != nil { ctx = cv diff --git a/listener/ws/listener.go b/listener/ws/listener.go index 18ac856d..4fa2a6f0 100644 --- a/listener/ws/listener.go +++ b/listener/ws/listener.go @@ -38,7 +38,7 @@ type wsListener struct { tlsEnabled bool cqueue chan net.Conn errChan chan error - logger logger.Logger + log logger.Logger md metadata options listener.Options } @@ -49,7 +49,7 @@ func NewListener(opts ...listener.Option) listener.Listener { opt(&options) } return &wsListener{ - logger: options.Logger, + log: options.Logger, options: options, } } @@ -61,7 +61,7 @@ func NewTLSListener(opts ...listener.Option) listener.Listener { } return &wsListener{ tlsEnabled: true, - logger: options.Logger, + log: options.Logger, options: options, } } @@ -98,7 +98,7 @@ func (l *wsListener) Init(md md.Metadata) (err error) { lc := net.ListenConfig{} if l.md.mptcp { lc.SetMultipathTCP(true) - l.logger.Debugf("mptcp enabled: %v", lc.MultipathTCP()) + l.log.Debugf("mptcp enabled: %v", lc.MultipathTCP()) } ln, err := lc.Listen(context.Background(), network, l.options.Addr) if err != nil { @@ -164,7 +164,7 @@ func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) { if clientIP != nil { cip = clientIP.String() } - log := l.logger.WithFields(map[string]any{ + log := l.log.WithFields(map[string]any{ "local": l.addr.String(), "remote": r.RemoteAddr, "client": cip, @@ -180,7 +180,7 @@ func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) { return } - ctx := r.Context() + ctx := context.Background() if cc, ok := conn.NetConn().(xctx.Context); ok { if cv := cc.Context(); cv != nil { ctx = cv