update
This commit is contained in:
@@ -56,11 +56,11 @@ func Instance(key ...string) *MyRedis {
|
||||
return instance
|
||||
}
|
||||
|
||||
func NewDefault(config *Config) (*MyRedis, error) {
|
||||
return New(DefaultKey, config)
|
||||
func InitDefault(config *Config) error {
|
||||
return Init(DefaultKey, config)
|
||||
}
|
||||
|
||||
func New(key string, config *Config) (*MyRedis, error) {
|
||||
func Init(key string, config *Config) error {
|
||||
var (
|
||||
maxConnAge, _ = time.ParseDuration(DefaultConfig.MaxConnAge)
|
||||
idleTimeout, _ = time.ParseDuration(DefaultConfig.IdleTimeout)
|
||||
@@ -77,7 +77,7 @@ func New(key string, config *Config) (*MyRedis, error) {
|
||||
if config.MaxConnAge != "" {
|
||||
t, err := time.ParseDuration(config.MaxConnAge)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parse MaxConnAge err: %s\n", err)
|
||||
return fmt.Errorf("parse MaxConnAge err: %s\n", err)
|
||||
|
||||
}
|
||||
maxConnAge = t
|
||||
@@ -86,7 +86,7 @@ func New(key string, config *Config) (*MyRedis, error) {
|
||||
if config.IdleTimeout != "" {
|
||||
t, err := time.ParseDuration(config.IdleTimeout)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parse IdleTimeout err: %s\n", err)
|
||||
return fmt.Errorf("parse IdleTimeout err: %s\n", err)
|
||||
|
||||
}
|
||||
idleTimeout = t
|
||||
@@ -107,11 +107,11 @@ func New(key string, config *Config) (*MyRedis, error) {
|
||||
rd.Client = client
|
||||
ping := rd.Client.Ping(ctx)
|
||||
if ping.Err() != nil {
|
||||
return nil, fmt.Errorf("connet redis err: %s", ping.Err())
|
||||
return fmt.Errorf("connet redis err: %s", ping.Err())
|
||||
}
|
||||
|
||||
instanceMap[key] = rd
|
||||
return rd, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetSimple 通用get
|
||||
@@ -165,16 +165,6 @@ func (r *MyRedis) SetJson(key string, value interface{}, t ...time.Duration) (st
|
||||
return r.Client.Set(ctx, key, v, t2).Result()
|
||||
}
|
||||
|
||||
func (r *MyRedis) Close() {
|
||||
if r.Client != nil {
|
||||
r.Client.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func (r *MyRedis) GetConn() *redis.Client {
|
||||
return r.Client
|
||||
}
|
||||
|
||||
func Close(key string) {
|
||||
Instance(key).Client.Close()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user