From e665921e6bb615edf3d9a10e13c22a8d57cbe5da Mon Sep 17 00:00:00 2001 From: papa-hexuan <60082213+papa-hexuan@users.noreply.github.com> Date: Wed, 26 Oct 2022 16:42:57 +0800 Subject: [PATCH] feat: redisgo rename to redis (#518) Co-authored-by: papa-hexuan --- pkg/client/{redisgo => redis}/client.go | 14 ++++++------- pkg/client/{redisgo => redis}/client_test.go | 4 ++-- pkg/client/{redisgo => redis}/config.go | 4 ++-- pkg/client/{redisgo => redis}/config_test.go | 20 +++++++++---------- pkg/client/{redisgo => redis}/init.go | 2 +- pkg/client/{redisgo => redis}/interceptor.go | 6 +++--- .../{redisgo => redis}/interceptor_test.go | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) rename pkg/client/{redisgo => redis}/client.go (86%) rename pkg/client/{redisgo => redis}/client_test.go (91%) rename pkg/client/{redisgo => redis}/config.go (98%) rename pkg/client/{redisgo => redis}/config_test.go (84%) rename pkg/client/{redisgo => redis}/init.go (99%) rename pkg/client/{redisgo => redis}/interceptor.go (98%) rename pkg/client/{redisgo => redis}/interceptor_test.go (99%) diff --git a/pkg/client/redisgo/client.go b/pkg/client/redis/client.go similarity index 86% rename from pkg/client/redisgo/client.go rename to pkg/client/redis/client.go index ab0c4c5a26..13b691bbcb 100644 --- a/pkg/client/redisgo/client.go +++ b/pkg/client/redis/client.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "context" @@ -21,13 +21,13 @@ type Client struct { func (ins *Client) CmdOnMaster() *redis.Client { if ins.master == nil { - ins.config.logger.Panic("redisgo:no master for "+ins.config.name, xlog.FieldExtMessage(ins.config)) + ins.config.logger.Panic("redis:no master for "+ins.config.name, xlog.FieldExtMessage(ins.config)) } return ins.master } func (ins *Client) CmdOnSlave() *redis.Client { if len(ins.slave) == 0 { - ins.config.logger.Panic("redisgo:no slave for "+ins.config.name, xlog.FieldExtMessage(ins.config)) + ins.config.logger.Panic("redis:no slave for "+ins.config.name, xlog.FieldExtMessage(ins.config)) } return ins.slave[rand.Intn(len(ins.slave))] } @@ -54,7 +54,7 @@ func (config *Config) MustSingleton() *Client { cc, err := config.Build() if err != nil { - config.logger.Panic("redisgo:"+err.Error(), xlog.FieldExtMessage(config)) + config.logger.Panic("redis:"+err.Error(), xlog.FieldExtMessage(config)) } singleton.Store(constant.ModuleClientRedis, config.name, cc) return cc @@ -65,7 +65,7 @@ func (config *Config) Build() (*Client, error) { ins := new(Client) var err error if xdebug.IsDevelopmentMode() { - xdebug.PrettyJsonPrint("redisgo's config: "+config.name, config) + xdebug.PrettyJsonPrint("redis's config: "+config.name, config) } if config.Master.Addr != "" { addr, user, pass := getUsernameAndPassword(config.Master.Addr) @@ -123,9 +123,9 @@ func (config *Config) build(addr, user, pass string) (*redis.Client, error) { if err := stubClient.Ping(context.Background()).Err(); err != nil { if config.OnDialError == "panic" { - config.logger.Panic("redisgo stub client start err: " + err.Error()) + config.logger.Panic("redis stub client start err: " + err.Error()) } - config.logger.Error("redisgo stub client start err", xlog.FieldErr(err)) + config.logger.Error("redis stub client start err", xlog.FieldErr(err)) return nil, err } diff --git a/pkg/client/redisgo/client_test.go b/pkg/client/redis/client_test.go similarity index 91% rename from pkg/client/redisgo/client_test.go rename to pkg/client/redis/client_test.go index 024b946104..df6372e2a5 100644 --- a/pkg/client/redisgo/client_test.go +++ b/pkg/client/redis/client_test.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "context" @@ -16,7 +16,7 @@ func Test_Stub(t *testing.T) { var client *Client defer func() { if r := recover(); r != nil { - assert.Equal(t, r.(string), "redisgo:no master or slaves for default") + assert.Equal(t, r.(string), "redis:no master or slaves for default") assert.Nil(t, client) } }() diff --git a/pkg/client/redisgo/config.go b/pkg/client/redis/config.go similarity index 98% rename from pkg/client/redisgo/config.go rename to pkg/client/redis/config.go index c329a2693a..47ac1fae6f 100644 --- a/pkg/client/redisgo/config.go +++ b/pkg/client/redis/config.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "strings" @@ -95,7 +95,7 @@ func DefaultConfig() *Config { // StdConfig ... func StdConfig(name string) *Config { - return RawConfig(name, constant.ConfigKey("redisgo", name, "stub")) + return RawConfig(name, constant.ConfigKey("redis", name, "stub")) } func RawConfig(name, key string) *Config { var config = DefaultConfig() diff --git a/pkg/client/redisgo/config_test.go b/pkg/client/redis/config_test.go similarity index 84% rename from pkg/client/redisgo/config_test.go rename to pkg/client/redis/config_test.go index 48914abc3b..4f5a0bc875 100644 --- a/pkg/client/redisgo/config_test.go +++ b/pkg/client/redis/config_test.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "bytes" @@ -13,18 +13,18 @@ import ( ) func TestStdConfig(t *testing.T) { - assert.Equal(t, constant.ConfigKey("redisgo", "test", "stub"), "jupiter.redisgo.test.stub") + assert.Equal(t, constant.ConfigKey("redis", "test", "stub"), "jupiter.redis.test.stub") var configStr = ` -[jupiter.redisgo] - [jupiter.redisgo.test.stub] +[jupiter.redis] + [jupiter.redis.test.stub] dialTimeout="2s" readTimeout="5s" idleTimeout="60s" username="" password="123" - [jupiter.redisgo.test.cluster] + [jupiter.redis.test.cluster] dialTimeout="2s" readTimeout="5s" idleTimeout="60s" @@ -46,15 +46,15 @@ func TestStdConfig(t *testing.T) { func TestConfig(t *testing.T) { var configStr = ` -[jupiter.redisgo] - [jupiter.redisgo.test] - [jupiter.redisgo.test.stub] +[jupiter.redis] + [jupiter.redis.test] + [jupiter.redis.test.stub] dialTimeout="2s" readTimeout="5s" idleTimeout="60s" - [jupiter.redisgo.test.stub.master] + [jupiter.redis.test.stub.master] addr="redis://:user111:password222@127.0.0.1:6379" - [jupiter.redisgo.test.stub.slaves] + [jupiter.redis.test.stub.slaves] addr=[ "redis://:user111:password222@127.0.0.2:6379", ] diff --git a/pkg/client/redisgo/init.go b/pkg/client/redis/init.go similarity index 99% rename from pkg/client/redisgo/init.go rename to pkg/client/redis/init.go index 5198e03194..8c7a76dd74 100644 --- a/pkg/client/redisgo/init.go +++ b/pkg/client/redis/init.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "net/http" diff --git a/pkg/client/redisgo/interceptor.go b/pkg/client/redis/interceptor.go similarity index 98% rename from pkg/client/redisgo/interceptor.go rename to pkg/client/redis/interceptor.go index 16ea6b2658..f0ac8b297e 100644 --- a/pkg/client/redisgo/interceptor.go +++ b/pkg/client/redis/interceptor.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "context" @@ -125,7 +125,7 @@ func debugInterceptor(compName string, addr string, config *Config, logger *xlog cost := time.Since(ctx.Value(ctxBegKey).(time.Time)) err := cmd.Err() fmt.Println(xstring.CallerName(6)) - fmt.Printf("[redisgo ] %s (%s) :\n", addr, cost) // nolint + fmt.Printf("[redis ] %s (%s) :\n", addr, cost) // nolint if err != nil { fmt.Printf(color.RedString("# %s %+v, ERR=(%s)\n\n", cmd.Name(), cmd.Args(), err.Error())) // nolint } else { @@ -136,7 +136,7 @@ func debugInterceptor(compName string, addr string, config *Config, logger *xlog setAfterProcessPipeline(func(ctx context.Context, cmds []redis.Cmder) error { cost := time.Since(ctx.Value(ctxBegKey).(time.Time)) fmt.Println(xstring.CallerName(8)) - fmt.Printf("[redisgo pipeline] %s (%s) :\n", addr, cost) // nolint + fmt.Printf("[redis pipeline] %s (%s) :\n", addr, cost) // nolint for _, cmd := range cmds { err := cmd.Err() if err != nil { diff --git a/pkg/client/redisgo/interceptor_test.go b/pkg/client/redis/interceptor_test.go similarity index 99% rename from pkg/client/redisgo/interceptor_test.go rename to pkg/client/redis/interceptor_test.go index fd8bd92aba..aa8ee3b93b 100644 --- a/pkg/client/redisgo/interceptor_test.go +++ b/pkg/client/redis/interceptor_test.go @@ -1,4 +1,4 @@ -package redisgo +package redis import ( "context"