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

grpc.dialer: do not resolve server address

Browse Source
This commit is contained in:
ginuerzh
2022-12-01 19:24:52 +08:00
parent 4ef4448249
commit 39cb9c65d9
3 changed files with 40 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
cmd/gost/main.go
View File

@ -55,74 +55,39 @@ func init() {
func main() {
cfg := &config.Config{}
var err error
if apiAddr != "" {
cfg, err = buildConfigFromCmd(services, nodes)
if err != nil {
if cfgFile != "" {
if err := cfg.ReadFile(cfgFile); err != nil {
log.Fatal(err)
}
if debug && cfg != nil {
if cfg.Log == nil {
cfg.Log = &config.LogConfig{}
}
cfg.Log.Level = string(logger.DebugLevel)
}
cmdCfg, err := buildConfigFromCmd(services, nodes)
if err != nil {
log.Fatal(err)
}
cfg.Chains = append(cfg.Chains, cmdCfg.Chains...)
cfg.Services = append(cfg.Services, cmdCfg.Services...)
if len(cfg.Services) == 0 && apiAddr == "" {
if err := cfg.Load(); err != nil {
log.Fatal(err)
}
if apiAddr != "" {
cfg.API = &config.APIConfig{
Addr: apiAddr,
}
}
if debug {
if cfg.Log == nil {
cfg.Log = &config.LogConfig{}
}
if metricsAddr != "" {
cfg.Metrics = &config.MetricsConfig{
Addr: metricsAddr,
}
cfg.Log.Level = string(logger.DebugLevel)
}
if apiAddr != "" {
cfg.API = &config.APIConfig{
Addr: apiAddr,
}
} else {
if cfgFile != "" {
err = cfg.ReadFile(cfgFile)
if err != nil {
log.Fatal(err)
}
} else {
err = cfg.Load()
if err != nil {
if len(services) > 0 {
log.Info("Cannot load config from default path. ", err)
} else {
log.Fatal(err)
}
}
}
if len(services) > 0 || len(nodes) > 0 {
var cmdCfg = &config.Config{}
cmdCfg, err = buildConfigFromCmd(services, nodes)
if err != nil {
log.Fatal(err)
}
if cmdCfg.Chains != nil && len(cmdCfg.Chains) > 0 {
if cfg.Chains == nil || len(cfg.Chains) == 0 {
cfg.Chains = cmdCfg.Chains
} else {
for i := 0; i < len(cfg.Chains); i++ {
var hops = append([]*config.HopConfig{}, cmdCfg.Chains[0].Hops...)
cfg.Chains[i].Hops = append(hops, cfg.Chains[i].Hops...)
}
}
}
if cmdCfg.Services != nil && len(cmdCfg.Services) > 0 {
if (cfg.Chains != nil && len(cfg.Chains) > 0) {
for i := 0; i < len(cmdCfg.Services); i++ {
var handler = cmdCfg.Services[i].Handler
if (handler != nil && (handler.Chain == "" && handler.ChainGroup == nil)) {
handler.Chain = cfg.Chains[0].Name
}
}
}
if cfg.Services == nil {
cfg.Services = []*config.ServiceConfig{}
}
cfg.Services = append(append([]*config.ServiceConfig{}, cmdCfg.Services...), cfg.Services...)
}
}
if metricsAddr != "" {
cfg.Metrics = &config.MetricsConfig{
Addr: metricsAddr,
}
}