Skip to content

Commit 3cccf0d

Browse files
wgffgwwgffgw
authored
Merge pull request #2 from enaguo/master
update package name and logger tag
2 parents 7807ee6 + 2f913d0 commit 3cccf0d

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎internal/core/redis.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,28 +80,28 @@ func initRedis() {
8080
if rt, err := strconv.Atoi(p); err == nil {
8181
options.PoolSize = rt
8282
} else {
83-
logger.E("Redis Error", "poolsize strconv.Atoi(%+v) error:%v", p, err)
83+
logger.E("xredis Error", "poolsize strconv.Atoi(%+v) error:%v", p, err)
8484
}
8585
}
8686
if p := confutil.GetConf("RedisConfig", k+".db"); p != "" {
8787
if rt, err := strconv.Atoi(p); err == nil {
8888
options.DB = rt
8989
} else {
90-
logger.E("Redis Error", ".db strconv.Atoi(%+v) error:%v", p, err)
90+
logger.E("xredis Error", ".db strconv.Atoi(%+v) error:%v", p, err)
9191
}
9292
}
9393
if p := confutil.GetConf("RedisConfig", k+".idletimeout"); p != "" {
9494
if rt, err := strconv.Atoi(p); err == nil {
9595
options.IdleTimeout = time.Second * time.Duration(rt)
9696
} else {
97-
logger.E("Redis Error", ".idletimeout strconv.Atoi(%+v) error:%v", p, err)
97+
logger.E("xredis Error", ".idletimeout strconv.Atoi(%+v) error:%v", p, err)
9898
}
9999
}
100100
if p := confutil.GetConf("RedisConfig", k+".readtimeout"); p != "" {
101101
if rt, err := strconv.Atoi(p); err == nil {
102102
options.ReadTimeout = time.Second * time.Duration(rt)
103103
} else {
104-
logger.E("Redis Error", ".readtimeout strconv.Atoi(%+v) error:%v", p, err)
104+
logger.E("xredis Error", ".readtimeout strconv.Atoi(%+v) error:%v", p, err)
105105
}
106106
}
107107
if p := confutil.GetConf("RedisConfig", k+".password"); p != "" {
@@ -111,7 +111,7 @@ func initRedis() {
111111
if rt, err := strconv.Atoi(p); err == nil {
112112
options.MaxRetries = rt
113113
} else {
114-
logger.E("Redis Error", ".maxretries strconv.Atoi(%+v) error:%v", p, err)
114+
logger.E("xredis Error", ".maxretries strconv.Atoi(%+v) error:%v", p, err)
115115
}
116116
}
117117
selectorIns := new(Selector)

‎internal/core/xesRedis.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (this *XesRedis) goRoutine() {
156156
res := this.exec()
157157
if res.err != nil {
158158
//this.String() called inside this.exec().
159-
logger.Ex(this.ctx, this.loggerTag, this.keyName+" "+this.cmd+" RedisErr: %v", res.err)
159+
logger.Ex(this.ctx, this.loggerTag, this.keyName+" "+this.cmd+" xredisErr: %v", res.err)
160160
}
161161
})
162162
if !result {
@@ -198,7 +198,7 @@ func (this *XesRedis) slowLog(start time.Time) {
198198
}
199199
cost := time.Now().Sub(start)
200200
if cost > threshold {
201-
logger.Ix(this.ctx, "XesRedis slowLog", "redis instance %s, cmd %v, key %v, args %v, cost %v", this.instance, this.cmd, this.key, this.args, cost)
201+
logger.Ix(this.ctx, "xredis slowLog", "redis instance %s, cmd %v, key %v, args %v, cost %v", this.instance, this.cmd, this.key, this.args, cost)
202202
}
203203
return
204204
}
@@ -217,7 +217,7 @@ func (this *XesRedis) warnSize(v interface{}) {
217217
size = len(fmt.Sprint(vv))
218218
}
219219
if size > maxSize {
220-
logger.Ix(this.ctx, "XesRedis warnSize", "redis instance %s, cmd %v, key %v, args %v, val szie %d", this.instance, this.cmd, this.key, this.args, size)
220+
logger.Ix(this.ctx, "xredis warnSize", "redis instance %s, cmd %v, key %v, args %v, val szie %d", this.instance, this.cmd, this.key, this.args, size)
221221
}
222222
return
223223
}
@@ -246,7 +246,7 @@ func (this *XesRedis) exec() RedisResult {
246246
newcmd = append(newcmd, v)
247247
}
248248

249-
logger.Dx(this.ctx, "XesRedis exec()", "redis instance %s, redis cmd %v", this.instance, newcmd)
249+
logger.Dx(this.ctx, "xredis exec()", "redis instance %s, redis cmd %v", this.instance, newcmd)
250250

251251
cmd := redis.NewCmd(newcmd...)
252252
if this.goPipeLine {
@@ -255,7 +255,7 @@ func (this *XesRedis) exec() RedisResult {
255255

256256
client := GetClient(this.instance)
257257
if client == nil {
258-
logger.Wx(this.ctx, "Redisdao.exec.ClientNil", "GetClient is nil, Instance : %v", this.instance)
258+
logger.Wx(this.ctx, "xredis.exec.ClientNil", "GetClient is nil, Instance : %v", this.instance)
259259
return RedisResult{err: logger.NewError("[exec] GetClient is nil")}
260260
}
261261

@@ -265,9 +265,9 @@ func (this *XesRedis) exec() RedisResult {
265265
res.err = err
266266
if err != nil {
267267
if err == redis.Nil {
268-
logger.Dx(this.ctx, "Redisdao.exec.RedisNil", "redis cmd %v, err msg %v", newcmd, err)
268+
logger.Dx(this.ctx, "xredis.exec.RedisNil", "redis cmd %v, err msg %v", newcmd, err)
269269
} else {
270-
logger.Ex(this.ctx, "Redisdao.exec.RedisError", "redis cmd %+v, err %v, info: %+v", newcmd, err, this.String())
270+
logger.Ex(this.ctx, "xredis.exec.RedisError", "redis cmd %+v, err %v, info: %+v", newcmd, err, this.String())
271271
}
272272
}
273273
this.warnSize(res.value)
@@ -285,7 +285,7 @@ func (this *XesRedis) OpenPipeLine() {
285285
for k, _ := range GetSelectors() {
286286
client := GetClient(k)
287287
if client == nil {
288-
logger.Ex(this.ctx, "Redisdao.OpenPipeLine", "GetClient fail:%v", k)
288+
logger.Ex(this.ctx, "xredis.OpenPipeLine", "GetClient fail:%v", k)
289289
continue
290290
}
291291
pip := &PipelineIns{client.Pipeline(), false}
@@ -314,7 +314,7 @@ func (this *XesRedis) ExecPipeLine() (ret []RedisResult, errs []error) {
314314
defer wg.Done()
315315
cmder, err := pip.pipeliner.Exec()
316316
if err != nil && err != redis.Nil {
317-
logger.Ex(this.ctx, "Redisdao.ExecPipeLine", "Pipeline execute error %v", err)
317+
logger.Ex(this.ctx, "xredis.ExecPipeLine", "Pipeline execute error %v", err)
318318
lo.Lock()
319319
errs = append(errs, err)
320320
lo.Unlock()
@@ -324,13 +324,13 @@ func (this *XesRedis) ExecPipeLine() (ret []RedisResult, errs []error) {
324324
var result RedisResult
325325
result.err = cmd.Err()
326326
if result.err != nil && result.err != redis.Nil {
327-
logger.Ex(this.ctx, "Redisdao.ExecPipeLine", "Pipeline execute %v command args %v, err %v", cmd.Name(), cast.ToStringSlice(cmd.Args()), cmd.Err())
327+
logger.Ex(this.ctx, "xredis.ExecPipeLine", "Pipeline execute %v command args %v, err %v", cmd.Name(), cast.ToStringSlice(cmd.Args()), cmd.Err())
328328
} else {
329329
tmpcmd, ok := cmd.(*redis.Cmd)
330330
if ok {
331331
result.value, _ = tmpcmd.Result()
332332
} else {
333-
result.err = logger.NewError("Redisdao.ExecPipeLine assert cmd fail")
333+
result.err = logger.NewError("xredis.ExecPipeLine assert cmd fail")
334334
}
335335
}
336336
lo.Lock()
@@ -385,7 +385,7 @@ func (this *XesRedis) String() (back string) {
385385
if err != nil {
386386
return str
387387
}
388-
logger.Ex(this.ctx, "XesRedis", "String str %v", str)
388+
logger.Ex(this.ctx, "xredis", "String str %v", str)
389389
if GetEnableKafka() {
390390
this.sendKafka("xes_redis_err", []byte(str))
391391
}

‎internal/handlers/defaultHandler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (this *DefaultHandler) getShardingKeyInConf(xesRedis redo.XesRedisBase, sha
3434

3535
machineNum, err := strconv.Atoi(confutil.GetConf("", shardingNumInConf))
3636
if err != nil || machineNum == 0 {
37-
logger.Ex(xesRedis.GetCtx(), "Redis", "GetInstance "+shardingNumInConf+" err %v(or value is 0)", err)
37+
logger.Ex(xesRedis.GetCtx(), "xredis", "GetInstance "+shardingNumInConf+" err %v(or value is 0)", err)
3838
machineNum = 0
3939
}
4040

‎xredis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Description：
88
*
99
================================================================*/
10-
package redisdao
10+
package xredis
1111

1212
import (
1313
"context"

‎xredis_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package redisdao
1+
package xredis
22

33
import (
44
"testing"

0 commit comments

Comments
 (0)