Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
98127fdebc
@ -22,6 +22,8 @@ func NewSys(RedisUrl []string, RedisPassword string, poolSize, minConns int, tim
|
|||||||
DialTimeout: timeOut,
|
DialTimeout: timeOut,
|
||||||
ReadTimeout: timeOut,
|
ReadTimeout: timeOut,
|
||||||
WriteTimeout: timeOut,
|
WriteTimeout: timeOut,
|
||||||
|
PoolFIFO: true,
|
||||||
|
IdleTimeout: time.Minute * 25,
|
||||||
})
|
})
|
||||||
sys = &Redis{
|
sys = &Redis{
|
||||||
client: client,
|
client: client,
|
||||||
|
@ -103,8 +103,8 @@ func newOptionsByOption(opts ...Option) Options {
|
|||||||
Redis_Single_DB: 1,
|
Redis_Single_DB: 1,
|
||||||
Redis_Cluster_Addr: []string{"127.0.0.1:6379"},
|
Redis_Cluster_Addr: []string{"127.0.0.1:6379"},
|
||||||
Redis_Cluster_Password: "",
|
Redis_Cluster_Password: "",
|
||||||
PoolSize: 64,
|
PoolSize: 128,
|
||||||
MinConns: 32,
|
MinConns: 64,
|
||||||
TimeOut: time.Second * 3,
|
TimeOut: time.Second * 3,
|
||||||
}
|
}
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
|
@ -23,6 +23,8 @@ func NewSys(RedisUrl, RedisPassword string, RedisDB int, poolSize, minConns int,
|
|||||||
DialTimeout: timeOut,
|
DialTimeout: timeOut,
|
||||||
WriteTimeout: timeOut,
|
WriteTimeout: timeOut,
|
||||||
ReadTimeout: timeOut,
|
ReadTimeout: timeOut,
|
||||||
|
PoolFIFO: true,
|
||||||
|
IdleTimeout: time.Minute * 25,
|
||||||
})
|
})
|
||||||
sys = &Redis{
|
sys = &Redis{
|
||||||
client: client,
|
client: client,
|
||||||
|
@ -373,7 +373,6 @@ func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip str
|
|||||||
"RedisAddr": config.LoaclDB.RedisAddr,
|
"RedisAddr": config.LoaclDB.RedisAddr,
|
||||||
"RedisPassword": config.LoaclDB.RedisPassword,
|
"RedisPassword": config.LoaclDB.RedisPassword,
|
||||||
"RedisDB": config.LoaclDB.RedisDB,
|
"RedisDB": config.LoaclDB.RedisDB,
|
||||||
"PoolSize": 300,
|
|
||||||
"MongodbUrl": config.LoaclDB.MongodbUrl,
|
"MongodbUrl": config.LoaclDB.MongodbUrl,
|
||||||
"MongodbDatabase": config.LoaclDB.MongodbDatabase,
|
"MongodbDatabase": config.LoaclDB.MongodbDatabase,
|
||||||
"CrossConfig": crosspath,
|
"CrossConfig": crosspath,
|
||||||
|
Loading…
Reference in New Issue
Block a user