root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update reloader package

Browse Source
This commit is contained in:
ginuerzh 2020-03-26 09:31:00 +08:00
parent 4ac048a8a2
commit 6799cc5a95
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/gost/cfg.go
View File

@ -14,7 +14,7 @@ import (
"github.com/ginuerzh/gost" "github.com/ginuerzh/gost"
"github.com/go-gost/bypass" "github.com/go-gost/bypass"
"github.com/go-gost/reload" "github.com/go-gost/reloader"
) )
var ( var (
@ -132,7 +132,7 @@ func parseAuthenticator(s string) (gost.Authenticator, error) {
au := gost.NewLocalAuthenticator(nil) au := gost.NewLocalAuthenticator(nil)
au.Reload(f) au.Reload(f)
go reload.PeriodReload(au, s) go reloader.PeriodReload(au, s)
return au, nil return au, nil
} }
@ -201,9 +201,9 @@ func parseBypasser(s string) bypass.Bypasser {
defer f.Close() defer f.Close()
bp := bypass.NewBypasser(reversed) bp := bypass.NewBypasser(reversed)
if reloader, ok := bp.(reload.Reloader); ok { if r, ok := bp.(reloader.Reloader); ok {
reloader.Reload(f) r.Reload(f)
go reload.PeriodReload(reloader, s) go reloader.PeriodReload(r, s)
} }
return bp return bp
@ -261,7 +261,7 @@ func parseResolver(cfg string) gost.Resolver {
resolver := gost.NewResolver(0) resolver := gost.NewResolver(0)
resolver.Reload(f) resolver.Reload(f)
go reload.PeriodReload(resolver, cfg) go reloader.PeriodReload(resolver, cfg)
return resolver return resolver
} }
@ -276,7 +276,7 @@ func parseHosts(s string) *gost.Hosts {
hosts := gost.NewHosts() hosts := gost.NewHosts()
hosts.Reload(f) hosts.Reload(f)
go reload.PeriodReload(hosts, s) go reloader.PeriodReload(hosts, s)
return hosts return hosts
} }

4
cmd/gost/peer.go
View File

@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/ginuerzh/gost" "github.com/ginuerzh/gost"
"github.com/go-gost/reload" "github.com/go-gost/reloader"
) )
type peerConfig struct { type peerConfig struct {
@ -75,7 +75,7 @@ func (cfg *peerConfig) Reload(r io.Reader) error {
nodes := group.SetNodes(gNodes...) nodes := group.SetNodes(gNodes...)
for _, node := range nodes[len(cfg.baseNodes):] { 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 s.Stop() // clear the old nodes
} }
} }

4
cmd/gost/route.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ginuerzh/gost" "github.com/ginuerzh/gost"
"github.com/go-gost/log" "github.com/go-gost/log"
"github.com/go-gost/reload" "github.com/go-gost/reloader"
) )
type stringList []string type stringList []string
@ -77,7 +77,7 @@ func (r *route) parseChain() (*gost.Chain, error) {
peerCfg.Reload(f) peerCfg.Reload(f)
f.Close() f.Close()
go reload.PeriodReload(peerCfg, cfg) go reloader.PeriodReload(peerCfg, cfg)
} }
chain.AddNodeGroup(ngroup) chain.AddNodeGroup(ngroup)

2
go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/go-gost/bypass v1.0.0 github.com/go-gost/bypass v1.0.0
github.com/go-gost/log v1.0.0 github.com/go-gost/log v1.0.0
github.com/go-gost/relay v0.1.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/golang/mock v1.2.0 // indirect
github.com/google/gopacket v1.1.17 // indirect github.com/google/gopacket v1.1.17 // indirect
github.com/gorilla/websocket v1.4.0 // indirect github.com/gorilla/websocket v1.4.0 // indirect

4
go.sum
View File

@ -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/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 h1:UOf2YwAzzaUjY5mdpMuLfSw0vz62iIFYk7oJQkuhlGw=
github.com/go-gost/relay v0.1.0/go.mod h1:YFCpddLOFE3NlIkeDWRdEs8gL/GFsqXdtaf8SV5v4YQ= 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/reloader v1.1.0 h1:ovbHzWTzmKVZdqgmuBsLIeCq6GRAMlcwargAxk4roBo=
github.com/go-gost/reload v1.0.0/go.mod h1:IVKerwSiS/YATAMeKRnmv3NhnIwFeLfXRTAyMsySnUM= 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 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= 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 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=

6
resolver.go
View File

@ -17,7 +17,7 @@ import (
"time" "time"
"github.com/go-gost/log" "github.com/go-gost/log"
"github.com/go-gost/reload" "github.com/go-gost/reloader"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
@ -181,8 +181,8 @@ type Resolver interface {
// ReloadResolver is resolover that support live reloading. // ReloadResolver is resolover that support live reloading.
type ReloadResolver interface { type ReloadResolver interface {
Resolver Resolver
reload.Reloader reloader.Reloader
reload.Stoppable reloader.Stoppable
} }
type resolver struct { type resolver struct {