Skip to content
Snippets Groups Projects
Commit 006ba977 authored by justimkiss's avatar justimkiss
Browse files

add protocol_conf default value

parent 37901fd8
No related branches found
No related tags found
No related merge requests found
......@@ -50,3 +50,5 @@ require (
google.golang.org/grpc v1.22.1
gopkg.in/yaml.v2 v2.2.2
)
go 1.13
......@@ -53,33 +53,35 @@ var (
func init() {
// load clientconfig from consumer_config
protocolConf := config.GetConsumerConfig().ProtocolConf
if protocolConf == nil {
logger.Warnf("protocol_conf is nil")
return
}
dubboConf := protocolConf.(map[interface{}]interface{})[DUBBO]
if dubboConf == nil {
logger.Warnf("dubboConf is nil")
// default use dubbo
consumerConfig := config.GetConsumerConfig()
if consumerConfig.ApplicationConfig == nil {
return
}
dubboConfByte, err := yaml.Marshal(dubboConf)
if err != nil {
panic(err)
}
conf := &ClientConfig{}
err = yaml.Unmarshal(dubboConfByte, conf)
if err != nil {
panic(err)
protocolConf := config.GetConsumerConfig().ProtocolConf
defaultClientConfig := GetDefaultClientConfig()
if protocolConf == nil {
logger.Info("protocol_conf default use dubbo config")
} else {
dubboConf := protocolConf.(map[interface{}]interface{})[DUBBO]
if dubboConf == nil {
logger.Warnf("dubboConf is nil")
return
}
dubboConfByte, err := yaml.Marshal(dubboConf)
if err != nil {
panic(err)
}
err = yaml.Unmarshal(dubboConfByte, &defaultClientConfig)
if err != nil {
panic(err)
}
}
if err := conf.CheckValidity(); err != nil {
clientConf = &defaultClientConfig
if err := clientConf.CheckValidity(); err != nil {
logger.Warnf("[CheckValidity] error: %v", err)
return
}
clientConf = conf
setClientGrpool()
}
......
......@@ -90,6 +90,57 @@ type (
}
)
func GetDefaultClientConfig() ClientConfig {
return ClientConfig{
ReconnectInterval: 0,
ConnectionNum: 16,
HeartbeatPeriod: "5s",
SessionTimeout: "20s",
PoolSize: 64,
PoolTTL: 600,
GrPoolSize: 1200,
QueueLen: 64,
QueueNumber: 60,
GettySessionParam: GettySessionParam{
CompressEncoding: false,
TcpNoDelay: true,
TcpKeepAlive: true,
KeepAlivePeriod: "120s",
TcpRBufSize: 262144,
TcpWBufSize: 65536,
PkgWQSize: 512,
TcpReadTimeout: "1s",
TcpWriteTimeout: "5s",
WaitTimeout: "1s",
MaxMsgLen: 2014,
SessionName: "client",
}}
}
func GetDefaultServerConfig() ServerConfig {
return ServerConfig{
SessionTimeout: "20s",
SessionNumber: 700,
GrPoolSize: 120,
QueueNumber: 6,
QueueLen: 64,
GettySessionParam: GettySessionParam{
CompressEncoding: false,
TcpNoDelay: true,
TcpKeepAlive: true,
KeepAlivePeriod: "120s",
TcpRBufSize: 262144,
TcpWBufSize: 65536,
PkgWQSize: 512,
TcpReadTimeout: "1s",
TcpWriteTimeout: "5s",
WaitTimeout: "1s",
MaxMsgLen: 1024,
SessionName: "server",
},
}
}
func (c *GettySessionParam) CheckValidity() error {
var err error
......
......@@ -42,32 +42,35 @@ var (
func init() {
// load clientconfig from provider_config
protocolConf := config.GetProviderConfig().ProtocolConf
if protocolConf == nil {
logger.Warnf("protocol_conf is nil")
return
}
dubboConf := protocolConf.(map[interface{}]interface{})[DUBBO]
if dubboConf == nil {
logger.Warnf("dubboConf is nil")
// default use dubbo
providerConfig := config.GetProviderConfig()
if providerConfig.ApplicationConfig == nil {
return
}
dubboConfByte, err := yaml.Marshal(dubboConf)
if err != nil {
panic(err)
}
conf := &ServerConfig{}
err = yaml.Unmarshal(dubboConfByte, conf)
if err != nil {
panic(err)
protocolConf := providerConfig.ProtocolConf
defaultServerConfig := GetDefaultServerConfig()
if protocolConf == nil {
logger.Info("protocol_conf default use dubbo config")
} else {
dubboConf := protocolConf.(map[interface{}]interface{})[DUBBO]
if dubboConf == nil {
logger.Warnf("dubboConf is nil")
return
}
dubboConfByte, err := yaml.Marshal(dubboConf)
if err != nil {
panic(err)
}
err = yaml.Unmarshal(dubboConfByte, &defaultServerConfig)
if err != nil {
panic(err)
}
}
if err := conf.CheckValidity(); err != nil {
srvConf = &defaultServerConfig
if err := srvConf.CheckValidity(); err != nil {
panic(err)
}
srvConf = conf
SetServerGrpool()
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment