diff --git a/chain.go b/chain.go index bedeb6f..7df6f5c 100644 --- a/chain.go +++ b/chain.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) var ( diff --git a/cmd/gost/main.go b/cmd/gost/main.go index fd520d6..400f97d 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -5,14 +5,14 @@ import ( "errors" "flag" "fmt" + stdlog "log" "net/http" + _ "net/http/pprof" "os" "runtime" - _ "net/http/pprof" - "github.com/ginuerzh/gost" - "github.com/go-log/log" + "github.com/go-gost/log" ) var ( @@ -23,7 +23,8 @@ var ( ) func init() { - gost.SetLogger(&gost.LogLogger{}) + stdlog.SetFlags(stdlog.LstdFlags | stdlog.Lshortfile) + gost.SetLogger(&log.StdLogger{}) var ( printVersion bool diff --git a/cmd/gost/route.go b/cmd/gost/route.go index 3fc1a9c..7f22cd4 100644 --- a/cmd/gost/route.go +++ b/cmd/gost/route.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/ginuerzh/gost" - "github.com/go-log/log" + "github.com/go-gost/log" ) type stringList []string diff --git a/common_test.go b/common_test.go index 9e030d6..35643ca 100644 --- a/common_test.go +++ b/common_test.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) func init() { diff --git a/dns.go b/dns.go index 278e57b..2fcffcb 100644 --- a/dns.go +++ b/dns.go @@ -15,7 +15,7 @@ import ( "time" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/miekg/dns" ) diff --git a/forward.go b/forward.go index 11ea0ae..d021886 100644 --- a/forward.go +++ b/forward.go @@ -11,7 +11,7 @@ import ( "fmt" "github.com/ginuerzh/gosocks5" - "github.com/go-log/log" + "github.com/go-gost/log" smux "gopkg.in/xtaci/smux.v1" ) diff --git a/ftcp.go b/ftcp.go index a1cfcf0..36d034d 100644 --- a/ftcp.go +++ b/ftcp.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/xtaci/tcpraw" ) diff --git a/go.mod b/go.mod index 0e398cb..bd149ee 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/ginuerzh/gosocks5 v0.2.0 github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796 github.com/go-gost/bpool v1.0.0 + github.com/go-gost/log v1.0.0 github.com/go-gost/relay v0.1.0 - github.com/go-log/log v0.1.0 github.com/gobwas/glob v0.2.3 github.com/golang/mock v1.2.0 // indirect github.com/google/gopacket v1.1.17 // indirect diff --git a/go.sum b/go.sum index 6d9d19c..535bc7a 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,7 @@ github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= github.com/docker/libcontainer v2.2.1+incompatible h1:++SbbkCw+X8vAd4j2gOCzZ2Nn7s2xFALTf7LZKmM1/0= github.com/docker/libcontainer v2.2.1+incompatible/go.mod h1:osvj61pYsqhNCMLGX31xr7klUBhHb/ZBuXS0o1Fvwbw= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ginuerzh/gosocks4 v0.0.1 h1:ojDKUyz+uaEeRm2usY1cyQiXTqJqrKxfeE6SVBXq4m0= github.com/ginuerzh/gosocks4 v0.0.1/go.mod h1:8SdwBMKjfJ9+BfP2vDJM1jcrgWUbWV6qxBPHHVrwptY= @@ -30,19 +31,23 @@ github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796 h1:VPXbYR github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796/go.mod h1:YyzP8PQrGwDH/XsfHJXwqdHLwWvBYxu77YVKm0+68f0= github.com/go-gost/bpool v1.0.0 h1:Og+6SH6SooHqf8CIwuxcPRHq8k0Si4YEfO2mBEi3/Uk= github.com/go-gost/bpool v1.0.0/go.mod h1:y/Pywm22A4OrJqNF/mL4nW7yb9fCdhlO8cxjyparkFI= +github.com/go-gost/log v1.0.0 h1:maSjjMvQqLSQYb0Ta5nJTdlRI+aiLMt6WIBYVxajJgs= +github.com/go-gost/log v1.0.0/go.mod h1:FCOaaJQ7moHTlLxYk7dsFewlS68U9A1GG3OR+yXkF6s= github.com/go-gost/relay v0.1.0 h1:UOf2YwAzzaUjY5mdpMuLfSw0vz62iIFYk7oJQkuhlGw= github.com/go-gost/relay v0.1.0/go.mod h1:YFCpddLOFE3NlIkeDWRdEs8gL/GFsqXdtaf8SV5v4YQ= -github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U= -github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY= github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/klauspost/compress v1.4.1 h1:8VMb5+0wMgdBykOV96DwNwKFQ+WTI4pzYURP99CcB9E= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -63,7 +68,9 @@ github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7 github.com/milosgajdos83/tenus v0.0.0-20190415114537-1f3ed00ae7d8 h1:4WFQEfEJ7zaHYViIVM2Cd6tnQOOhiEHbmQtlcV7aOpc= github.com/milosgajdos83/tenus v0.0.0-20190415114537-1f3ed00ae7d8/go.mod h1:G95Wwn625/q6JCCytI4VR/a5VtPwrtI0B+Q1Gi38QLA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -97,6 +104,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -108,13 +116,17 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gorilla/websocket.v1 v1.4.0 h1:lREme3ezAGPCpxSHwjGkHhAJX+ed2B6vzAJ+kaqBEIM= gopkg.in/gorilla/websocket.v1 v1.4.0/go.mod h1:Ons1i8d00TjvJPdla7bJyeXFsdOacUyrTYbg9IetsIE= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/xtaci/kcp-go.v4 v4.3.2 h1:S9IF+L55Ugzl/hVA6wvuL3SuAtTUzH2cBBC88MXQxnE= gopkg.in/xtaci/kcp-go.v4 v4.3.2/go.mod h1:fFYTlSOHNOHDNTKfoqarZMQsu7g7oXKwJ9wq0i9lODc= gopkg.in/xtaci/smux.v1 v1.0.7 h1:qootIZs4ZPSx5blhvgaFpx2epdFSWkyw99xT+q0mRXI= gopkg.in/xtaci/smux.v1 v1.0.7/go.mod h1:NbrPjLp8lNAYN8KqTplnFr2JjIBbr7CdHBkHtHsXtWA= +gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/gost.go b/gost.go index 0ec2579..8e80243 100644 --- a/gost.go +++ b/gost.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) // Version is the gost version. diff --git a/handler.go b/handler.go index db53147..199a14b 100644 --- a/handler.go +++ b/handler.go @@ -9,7 +9,7 @@ import ( "github.com/ginuerzh/gosocks4" "github.com/ginuerzh/gosocks5" - "github.com/go-log/log" + "github.com/go-gost/log" ) // Handler is a proxy server handler diff --git a/hosts.go b/hosts.go index 6df0325..19e1260 100644 --- a/hosts.go +++ b/hosts.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) // Host is a static mapping from hostname to IP. diff --git a/http.go b/http.go index 2027dc8..893f263 100644 --- a/http.go +++ b/http.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) type httpConnector struct { diff --git a/http2.go b/http2.go index 1c3cf5a..fdda4ec 100644 --- a/http2.go +++ b/http2.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" "golang.org/x/net/http2" ) diff --git a/kcp.go b/kcp.go index 9f1f6c5..2346d3f 100644 --- a/kcp.go +++ b/kcp.go @@ -13,7 +13,7 @@ import ( "sync" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/klauspost/compress/snappy" "github.com/xtaci/tcpraw" "gopkg.in/xtaci/kcp-go.v4" diff --git a/log.go b/log.go deleted file mode 100644 index d4ad519..0000000 --- a/log.go +++ /dev/null @@ -1,36 +0,0 @@ -package gost - -import ( - "fmt" - "log" -) - -func init() { - log.SetFlags(log.LstdFlags | log.Lshortfile) -} - -// LogLogger uses the standard log package as the logger -type LogLogger struct { -} - -// Log uses the standard log library log.Output -func (l *LogLogger) Log(v ...interface{}) { - log.Output(3, fmt.Sprintln(v...)) -} - -// Logf uses the standard log library log.Output -func (l *LogLogger) Logf(format string, v ...interface{}) { - log.Output(3, fmt.Sprintf(format, v...)) -} - -// NopLogger is a dummy logger that discards the log outputs -type NopLogger struct { -} - -// Log does nothing -func (l *NopLogger) Log(v ...interface{}) { -} - -// Logf does nothing -func (l *NopLogger) Logf(format string, v ...interface{}) { -} diff --git a/obfs.go b/obfs.go index 4e161d3..ee23eca 100644 --- a/obfs.go +++ b/obfs.go @@ -17,7 +17,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" pt "git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/obfs4.git/transports/base" diff --git a/quic.go b/quic.go index 1e7cf4d..b3ca986 100644 --- a/quic.go +++ b/quic.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" quic "github.com/lucas-clemente/quic-go" ) diff --git a/redirect.go b/redirect.go index 0ab59d1..a8aea79 100644 --- a/redirect.go +++ b/redirect.go @@ -12,7 +12,7 @@ import ( "time" "github.com/LiamHaworth/go-tproxy" - "github.com/go-log/log" + "github.com/go-gost/log" ) type tcpRedirectHandler struct { diff --git a/redirect_other.go b/redirect_other.go index d2a576a..aec3190 100644 --- a/redirect_other.go +++ b/redirect_other.go @@ -6,7 +6,7 @@ import ( "errors" "net" - "github.com/go-log/log" + "github.com/go-gost/log" ) type tcpRedirectHandler struct { diff --git a/relay.go b/relay.go index 640bfd6..55444f1 100644 --- a/relay.go +++ b/relay.go @@ -14,8 +14,8 @@ import ( "time" "github.com/go-gost/bpool" + "github.com/go-gost/log" "github.com/go-gost/relay" - "github.com/go-log/log" ) type relayConnector struct { diff --git a/reload.go b/reload.go index 08d708a..d8a6b34 100644 --- a/reload.go +++ b/reload.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/go-log/log" + "github.com/go-gost/log" ) // Reloader is the interface for objects that support live reloading. diff --git a/resolver.go b/resolver.go index 618d724..8f388a9 100644 --- a/resolver.go +++ b/resolver.go @@ -16,7 +16,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/miekg/dns" ) diff --git a/server.go b/server.go index 6e4e8a5..79d28dc 100644 --- a/server.go +++ b/server.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" ) // Accepter represents a network endpoint that can accept connection from peer. diff --git a/signal_unix.go b/signal_unix.go index f5800e1..9c0c623 100644 --- a/signal_unix.go +++ b/signal_unix.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "github.com/go-log/log" + "github.com/go-gost/log" "gopkg.in/xtaci/kcp-go.v4" ) diff --git a/sni.go b/sni.go index 62e5fb7..575e193 100644 --- a/sni.go +++ b/sni.go @@ -18,7 +18,7 @@ import ( "sync" dissector "github.com/ginuerzh/tls-dissector" - "github.com/go-log/log" + "github.com/go-gost/log" ) type sniConnector struct { diff --git a/socks.go b/socks.go index d1f7436..afb1660 100644 --- a/socks.go +++ b/socks.go @@ -16,7 +16,7 @@ import ( "github.com/ginuerzh/gosocks4" "github.com/ginuerzh/gosocks5" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" smux "gopkg.in/xtaci/smux.v1" ) diff --git a/ss.go b/ss.go index 5f37f2a..7c13998 100644 --- a/ss.go +++ b/ss.go @@ -12,7 +12,7 @@ import ( "github.com/ginuerzh/gosocks5" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/shadowsocks/go-shadowsocks2/core" ss "github.com/shadowsocks/shadowsocks-go/shadowsocks" ) diff --git a/ssh.go b/ssh.go index e4b1ab6..2aeff0b 100644 --- a/ssh.go +++ b/ssh.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" "golang.org/x/crypto/ssh" ) diff --git a/tls.go b/tls.go index 44faff6..7943d11 100644 --- a/tls.go +++ b/tls.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/go-log/log" + "github.com/go-gost/log" smux "gopkg.in/xtaci/smux.v1" ) diff --git a/tuntap.go b/tuntap.go index 0ab506d..4825991 100644 --- a/tuntap.go +++ b/tuntap.go @@ -11,7 +11,7 @@ import ( "time" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/shadowsocks/go-shadowsocks2/core" "github.com/shadowsocks/go-shadowsocks2/shadowaead" "github.com/songgao/water" diff --git a/tuntap_darwin.go b/tuntap_darwin.go index ffe2ac7..2430762 100644 --- a/tuntap_darwin.go +++ b/tuntap_darwin.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/songgao/water" ) diff --git a/tuntap_linux.go b/tuntap_linux.go index 4e83fa9..6be62f2 100644 --- a/tuntap_linux.go +++ b/tuntap_linux.go @@ -5,7 +5,7 @@ import ( "net" "github.com/docker/libcontainer/netlink" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/milosgajdos83/tenus" "github.com/songgao/water" ) diff --git a/tuntap_unix.go b/tuntap_unix.go index 9a6d17e..9715d75 100644 --- a/tuntap_unix.go +++ b/tuntap_unix.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/songgao/water" ) diff --git a/tuntap_windows.go b/tuntap_windows.go index 21af512..c8e3ab8 100644 --- a/tuntap_windows.go +++ b/tuntap_windows.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/go-log/log" + "github.com/go-gost/log" "github.com/songgao/water" ) diff --git a/udp.go b/udp.go index 4669868..d77b61e 100644 --- a/udp.go +++ b/udp.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-gost/bpool" - "github.com/go-log/log" + "github.com/go-gost/log" ) // udpTransporter is a raw UDP transporter. diff --git a/ws.go b/ws.go index 7a5a3ea..7d6dc50 100644 --- a/ws.go +++ b/ws.go @@ -14,7 +14,7 @@ import ( "net/url" - "github.com/go-log/log" + "github.com/go-gost/log" "gopkg.in/gorilla/websocket.v1" smux "gopkg.in/xtaci/smux.v1" )