go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update registry

Browse Source
This commit is contained in:
ginuerzh
2022-02-27 22:32:15 +08:00
parent 0aee4f0ebd
commit 07132d8de7
115 changed files with 651 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/gost/cmd.go
View File

@ -270,10 +270,10 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
Addr: url.Host,
}
if h := registry.GetHandler(handler); h == nil {
if h := registry.HandlerRegistry().Get(handler); h == nil {
handler = "auto"
}
if ln := registry.GetListener(listener); ln == nil {
if ln := registry.ListenerRegistry().Get(listener); ln == nil {
listener = "tcp"
if handler == "ssu" {
listener = "udp"
@ -378,10 +378,10 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
Addr: url.Host,
}
if c := registry.GetConnector(connector); c == nil {
if c := registry.ConnectorRegistry().Get(connector); c == nil {
connector = "http"
}
if d := registry.GetDialer(dialer); d == nil {
if d := registry.DialerRegistry().Get(dialer); d == nil {
dialer = "tcp"
if connector == "ssu" {
dialer = "udp"

16
cmd/gost/config.go
View File

@ -20,7 +20,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
for _, autherCfg := range cfg.Authers {
if auther := parsing.ParseAuther(autherCfg); auther != nil {
if err := registry.Auther().Register(autherCfg.Name, auther); err != nil {
if err := registry.AutherRegistry().Register(autherCfg.Name, auther); err != nil {
log.Fatal(err)
}
}
@ -28,7 +28,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
for _, admissionCfg := range cfg.Admissions {
if adm := parsing.ParseAdmission(admissionCfg); adm != nil {
if err := registry.Admission().Register(admissionCfg.Name, adm); err != nil {
if err := registry.AdmissionRegistry().Register(admissionCfg.Name, adm); err != nil {
log.Fatal(err)
}
}
@ -36,7 +36,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
for _, bypassCfg := range cfg.Bypasses {
if bp := parsing.ParseBypass(bypassCfg); bp != nil {
if err := registry.Bypass().Register(bypassCfg.Name, bp); err != nil {
if err := registry.BypassRegistry().Register(bypassCfg.Name, bp); err != nil {
log.Fatal(err)
}
}
@ -48,7 +48,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
log.Fatal(err)
}
if r != nil {
if err := registry.Resolver().Register(resolverCfg.Name, r); err != nil {
if err := registry.ResolverRegistry().Register(resolverCfg.Name, r); err != nil {
log.Fatal(err)
}
}
@ -56,7 +56,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
for _, hostsCfg := range cfg.Hosts {
if h := parsing.ParseHosts(hostsCfg); h != nil {
if err := registry.Hosts().Register(hostsCfg.Name, h); err != nil {
if err := registry.HostsRegistry().Register(hostsCfg.Name, h); err != nil {
log.Fatal(err)
}
}
@ -68,7 +68,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
log.Fatal(err)
}
if c != nil {
if err := registry.Chain().Register(chainCfg.Name, c); err != nil {
if err := registry.ChainRegistry().Register(chainCfg.Name, c); err != nil {
log.Fatal(err)
}
}
@ -80,7 +80,7 @@ func buildService(cfg *config.Config) (services []service.Service) {
log.Fatal(err)
}
if svc != nil {
if err := registry.Service().Register(svcCfg.Name, svc); err != nil {
if err := registry.ServiceRegistry().Register(svcCfg.Name, svc); err != nil {
log.Fatal(err)
}
}
@ -123,7 +123,7 @@ func logFromConfig(cfg *config.LogConfig) logger.Logger {
func buildAPIService(cfg *config.APIConfig) (service.Service, error) {
auther := parsing.ParseAutherFromAuth(cfg.Auth)
if cfg.Auther != "" {
auther = registry.Auther().Get(cfg.Auther)
auther = registry.AutherRegistry().Get(cfg.Auther)
}
return api.NewService(
cfg.Addr,