fix log usage

This commit is contained in:
ginuerzh
2022-01-26 16:45:57 +08:00
parent 04dfc8c4c3
commit 713586729b
16 changed files with 183 additions and 185 deletions

View File

@ -9,7 +9,6 @@ import (
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/common/util/ss"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
"github.com/shadowsocks/go-shadowsocks2/core"
@ -22,7 +21,6 @@ func init() {
type ssuConnector struct {
cipher core.Cipher
md metadata
logger logger.Logger
options connector.Options
}
@ -34,7 +32,6 @@ func NewConnector(opts ...connector.Option) connector.Connector {
return &ssuConnector{
options: options,
logger: options.Logger,
}
}
@ -53,19 +50,19 @@ func (c *ssuConnector) Init(md md.Metadata) (err error) {
}
func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
c.logger = c.logger.WithFields(map[string]interface{}{
log := c.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"network": network,
"address": address,
})
c.logger.Infof("connect %s/%s", address, network)
log.Infof("connect %s/%s", address, network)
switch network {
case "udp", "udp4", "udp6":
default:
err := fmt.Errorf("network %s is unsupported", network)
c.logger.Error(err)
log.Error(err)
return nil, err
}