diff --git a/README.md b/README.md index 5907bf6..460d7b7 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,3 @@ docker pull gogost/gost ### Shadowsocks Android插件 [xausky/ShadowsocksGostPlugin](https://github.com/xausky/ShadowsocksGostPlugin) - -## 问题建议 - -提交Issue: [https://github.com/go-gost/gost/issues](https://github.com/go-gost/gost/issues) - -Telegram讨论群: [https://t.me/gogost](https://t.me/gogost) - -Google讨论组: [https://groups.google.com/d/forum/go-gost](https://groups.google.com/d/forum/go-gost) \ No newline at end of file diff --git a/cmd/gost/config.go b/cmd/gost/config.go index e68fadf..7f8ce28 100644 --- a/cmd/gost/config.go +++ b/cmd/gost/config.go @@ -5,12 +5,12 @@ import ( "os" "github.com/go-gost/core/logger" - metrics "github.com/go-gost/core/metrics/service" "github.com/go-gost/core/service" "github.com/go-gost/x/api" "github.com/go-gost/x/config" "github.com/go-gost/x/config/parsing" xlogger "github.com/go-gost/x/logger" + metrics "github.com/go-gost/x/metrics/service" "github.com/go-gost/x/registry" ) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index fbef569..a8168ae 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -13,6 +13,7 @@ import ( "github.com/go-gost/x/config" "github.com/go-gost/x/config/parsing" xlogger "github.com/go-gost/x/logger" + xmetrics "github.com/go-gost/x/metrics" ) var ( @@ -118,7 +119,7 @@ func main() { } if cfg.Metrics != nil { - metrics.SetGlobal(metrics.NewMetrics()) + metrics.SetGlobal(xmetrics.NewMetrics()) if cfg.Metrics.Addr != "" { s, err := buildMetricsService(cfg.Metrics) if err != nil { diff --git a/go.mod b/go.mod index 721ff7d..6a5d4c6 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.18 replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20211111114238-98168dcec14a require ( - github.com/go-gost/core v0.0.0-20220404130002-d6e6efb0935b - github.com/go-gost/x v0.0.0-20220404044539-6aa1cc740156 + github.com/go-gost/core v0.0.0-20220405095520-c2f49e94443c + github.com/go-gost/x v0.0.0-20220405095636-1444ebc1ee1e ) require ( diff --git a/go.sum b/go.sum index b616d94..2e8b2bf 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gost/core v0.0.0-20220404130002-d6e6efb0935b h1:Whi3wMi5aiC9kVBfTNYe5uVcaElYZqyrDYM94MJvH+A= github.com/go-gost/core v0.0.0-20220404130002-d6e6efb0935b/go.mod h1:/LzdiQ+0+3FMhyqw0phjFjXFdOa1fcQR5/bL/7ripCs= +github.com/go-gost/core v0.0.0-20220405095520-c2f49e94443c h1:TzDyqefjnUVgdT6piHZgeXrVKXevawsMs0kmSZZhDR4= +github.com/go-gost/core v0.0.0-20220405095520-c2f49e94443c/go.mod h1:/LzdiQ+0+3FMhyqw0phjFjXFdOa1fcQR5/bL/7ripCs= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= @@ -131,6 +133,8 @@ github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= github.com/go-gost/x v0.0.0-20220404044539-6aa1cc740156 h1:Vh48o3X5zZRT5e50wgLGr1GNnHqHV/GRVUnpMc4hrwU= github.com/go-gost/x v0.0.0-20220404044539-6aa1cc740156/go.mod h1:ZcHIO92IOsnu7K723MCN+aNVgwuRTgYN5pBvQku4o8s= +github.com/go-gost/x v0.0.0-20220405095636-1444ebc1ee1e h1:pdb9YuFeL4xUW1IUR5Yi/9kbcoPvcZESJXxCD8F9GG4= +github.com/go-gost/x v0.0.0-20220405095636-1444ebc1ee1e/go.mod h1:CYM7F8diDl+8KW6v/JJmnHRV7h8Rz7ooIfrLpZebGQw= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=