extended stats to include number of rpc connections, routes, peers
This commit is contained in:
@ -40,29 +40,33 @@ type ClientTLSConfig struct {
|
||||
ServerName string `yaml:"server-name"`
|
||||
}
|
||||
|
||||
type ServiceConfig struct {
|
||||
Prefix string `yaml:"prefix"`
|
||||
Addrs []string `yaml:"addresses"`
|
||||
}
|
||||
|
||||
type ServerConfig struct {
|
||||
CTL struct {
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
ServiceAddrs []string `yaml:"service-addrs"`
|
||||
Service ServiceConfig `yaml:"service"`
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
} `yaml:"ctl"`
|
||||
|
||||
RPC struct {
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
ServiceAddrs []string `yaml:"service-addrs"`
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
ServiceAddrs []string `yaml:"service-addrs"`
|
||||
} `yaml:"rpc"`
|
||||
}
|
||||
|
||||
type ClientConfig struct {
|
||||
CTL struct {
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
ServiceAddrs []string `yaml:"service-addrs"`
|
||||
Service ServiceConfig `yaml:"endpoint"`
|
||||
TLS ServerTLSConfig `yaml:"tls"`
|
||||
} `yaml:"ctl"`
|
||||
RPC struct {
|
||||
TLS ClientTLSConfig `yaml:"tls"`
|
||||
TLS ClientTLSConfig `yaml:"tls"`
|
||||
} `yaml:"rpc"`
|
||||
}
|
||||
|
||||
|
||||
func load_server_config(cfgfile string) (*ServerConfig, error) {
|
||||
var cfg ServerConfig
|
||||
var f *os.File
|
||||
|
@ -163,6 +163,7 @@ func server_main(ctl_addrs []string, svcaddrs []string, cfg *ServerConfig) error
|
||||
ctl_addrs,
|
||||
svcaddrs,
|
||||
&AppLogger{id: "server", out: os.Stderr},
|
||||
cfg.CTL.Service.Prefix,
|
||||
ctltlscfg,
|
||||
rpctlscfg)
|
||||
if err != nil {
|
||||
@ -201,6 +202,7 @@ func client_main(ctl_addrs []string, server_addr string, peer_addrs []string, cf
|
||||
context.Background(),
|
||||
ctl_addrs,
|
||||
&AppLogger{id: "client", out: os.Stderr},
|
||||
cfg.CTL.Service.Prefix,
|
||||
ctltlscfg,
|
||||
rpctlscfg)
|
||||
|
||||
@ -260,7 +262,7 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
if len(ctl_addrs) <= 0 { ctl_addrs = cfg.CTL.ServiceAddrs }
|
||||
if len(ctl_addrs) <= 0 { ctl_addrs = cfg.CTL.Service.Addrs }
|
||||
|
||||
err = server_main(ctl_addrs, rpc_addrs, cfg)
|
||||
if err != nil {
|
||||
@ -306,7 +308,7 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
if len(ctl_addrs) < 1 { ctl_addrs = cfg.CTL.ServiceAddrs }
|
||||
if len(ctl_addrs) < 1 { ctl_addrs = cfg.CTL.Service.Addrs }
|
||||
|
||||
err = client_main(ctl_addrs, rpc_addrs[0], flgs.Args(), cfg)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user