diff --git a/cmd/gost/cfg.go b/cmd/gost/cfg.go index 74116b4..ff264b1 100644 --- a/cmd/gost/cfg.go +++ b/cmd/gost/cfg.go @@ -14,7 +14,7 @@ import ( "github.com/ginuerzh/gost" "github.com/go-gost/bypass" - "github.com/go-gost/reload" + "github.com/go-gost/reloader" ) var ( @@ -132,7 +132,7 @@ func parseAuthenticator(s string) (gost.Authenticator, error) { au := gost.NewLocalAuthenticator(nil) au.Reload(f) - go reload.PeriodReload(au, s) + go reloader.PeriodReload(au, s) return au, nil } @@ -201,9 +201,9 @@ func parseBypasser(s string) bypass.Bypasser { defer f.Close() bp := bypass.NewBypasser(reversed) - if reloader, ok := bp.(reload.Reloader); ok { - reloader.Reload(f) - go reload.PeriodReload(reloader, s) + if r, ok := bp.(reloader.Reloader); ok { + r.Reload(f) + go reloader.PeriodReload(r, s) } return bp @@ -261,7 +261,7 @@ func parseResolver(cfg string) gost.Resolver { resolver := gost.NewResolver(0) resolver.Reload(f) - go reload.PeriodReload(resolver, cfg) + go reloader.PeriodReload(resolver, cfg) return resolver } @@ -276,7 +276,7 @@ func parseHosts(s string) *gost.Hosts { hosts := gost.NewHosts() hosts.Reload(f) - go reload.PeriodReload(hosts, s) + go reloader.PeriodReload(hosts, s) return hosts } diff --git a/cmd/gost/peer.go b/cmd/gost/peer.go index 85c986a..0f4924c 100644 --- a/cmd/gost/peer.go +++ b/cmd/gost/peer.go @@ -11,7 +11,7 @@ import ( "time" "github.com/ginuerzh/gost" - "github.com/go-gost/reload" + "github.com/go-gost/reloader" ) type peerConfig struct { @@ -75,7 +75,7 @@ func (cfg *peerConfig) Reload(r io.Reader) error { nodes := group.SetNodes(gNodes...) for _, node := range nodes[len(cfg.baseNodes):] { - if s, ok := node.Bypasser.(reload.Stoppable); ok { + if s, ok := node.Bypasser.(reloader.Stoppable); ok { s.Stop() // clear the old nodes } } diff --git a/cmd/gost/route.go b/cmd/gost/route.go index ffb85ef..b21f165 100644 --- a/cmd/gost/route.go +++ b/cmd/gost/route.go @@ -12,7 +12,7 @@ import ( "github.com/ginuerzh/gost" "github.com/go-gost/log" - "github.com/go-gost/reload" + "github.com/go-gost/reloader" ) type stringList []string @@ -77,7 +77,7 @@ func (r *route) parseChain() (*gost.Chain, error) { peerCfg.Reload(f) f.Close() - go reload.PeriodReload(peerCfg, cfg) + go reloader.PeriodReload(peerCfg, cfg) } chain.AddNodeGroup(ngroup) diff --git a/go.mod b/go.mod index 8036254..54aef86 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/go-gost/bypass v1.0.0 github.com/go-gost/log v1.0.0 github.com/go-gost/relay v0.1.0 - github.com/go-gost/reload v1.0.0 + github.com/go-gost/reloader v1.1.0 github.com/golang/mock v1.2.0 // indirect github.com/google/gopacket v1.1.17 // indirect github.com/gorilla/websocket v1.4.0 // indirect diff --git a/go.sum b/go.sum index b59e76e..29bfea4 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ 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-gost/reload v1.0.0 h1:dcC3YwHXLlvow53UKH8gKhyguX0atkBV+/y7fHIGpCU= -github.com/go-gost/reload v1.0.0/go.mod h1:IVKerwSiS/YATAMeKRnmv3NhnIwFeLfXRTAyMsySnUM= +github.com/go-gost/reloader v1.1.0 h1:ovbHzWTzmKVZdqgmuBsLIeCq6GRAMlcwargAxk4roBo= +github.com/go-gost/reloader v1.1.0/go.mod h1:9EbWvTaddhwuIKlR3Byto/oHamAf/kIGKf333ALfpT0= 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= diff --git a/resolver.go b/resolver.go index 25006e8..80dff3a 100644 --- a/resolver.go +++ b/resolver.go @@ -17,7 +17,7 @@ import ( "time" "github.com/go-gost/log" - "github.com/go-gost/reload" + "github.com/go-gost/reloader" "github.com/miekg/dns" ) @@ -181,8 +181,8 @@ type Resolver interface { // ReloadResolver is resolover that support live reloading. type ReloadResolver interface { Resolver - reload.Reloader - reload.Stoppable + reloader.Reloader + reloader.Stoppable } type resolver struct {