提交 8cc1c024 authored 作者: mooncake9527's avatar mooncake9527

rl可直接传入redis conn,省去一个redis conn

上级 867bafca
...@@ -24,14 +24,14 @@ func (d *RedisDatastore) fullKey(key string, start int64) string { ...@@ -24,14 +24,14 @@ func (d *RedisDatastore) fullKey(key string, start int64) string {
func (d *RedisDatastore) Add(ctx context.Context, key string, start, value int64) (int64, error) { func (d *RedisDatastore) Add(ctx context.Context, key string, start, value int64) (int64, error) {
k := d.fullKey(key, start) k := d.fullKey(key, start)
startTime := time.Now() startTime := time.Now()
c, err := d.client.IncrBy(context.Background(), k, value).Result() c, err := d.client.IncrBy(ctx, k, value).Result()
if err != nil { if err != nil {
if d.logger != nil { if d.logger != nil {
d.logger.Error(fmt.Sprintf("[SlideWindow] add fail,[k:%s add:%d]", k, value), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx)) d.logger.Error(fmt.Sprintf("[SlideWindow] add fail,[k:%s add:%d]", k, value), zap.String("err", err.Error()), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
} }
return 0, err return 0, err
} }
_, _ = d.client.Expire(context.Background(), k, d.ttl).Result() _, _ = d.client.Expire(ctx, k, d.ttl).Result()
if d.logger != nil { if d.logger != nil {
d.logger.Info(fmt.Sprintf("[SlideWindow] add success,[k:%s add:%d -> %d]", k, value, c), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx)) d.logger.Info(fmt.Sprintf("[SlideWindow] add success,[k:%s add:%d -> %d]", k, value, c), zap.String("cost", time.Since(startTime).String()), xctx.CtxTraceIDField(ctx))
} }
...@@ -41,7 +41,7 @@ func (d *RedisDatastore) Add(ctx context.Context, key string, start, value int64 ...@@ -41,7 +41,7 @@ func (d *RedisDatastore) Add(ctx context.Context, key string, start, value int64
func (d *RedisDatastore) Get(ctx context.Context, key string, start int64) (int64, error) { func (d *RedisDatastore) Get(ctx context.Context, key string, start int64) (int64, error) {
k := d.fullKey(key, start) k := d.fullKey(key, start)
startTime := time.Now() startTime := time.Now()
value, err := d.client.Get(context.Background(), k).Result() value, err := d.client.Get(ctx, k).Result()
if err != nil { if err != nil {
if err == redis.Nil { if err == redis.Nil {
err = nil err = nil
......
...@@ -28,7 +28,7 @@ func NewCustomGormLogger(l *zap.Logger, requestIDKey string, logLevel logger.Log ...@@ -28,7 +28,7 @@ func NewCustomGormLogger(l *zap.Logger, requestIDKey string, logLevel logger.Log
l, _ = zap.NewProduction() l, _ = zap.NewProduction()
} }
if requestIDKey == "" { if requestIDKey == "" {
requestIDKey = "request_id" requestIDKey = "traceID"
} }
if logLevel == 0 { if logLevel == 0 {
logLevel = logger.Info logLevel = logger.Info
...@@ -96,7 +96,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql ...@@ -96,7 +96,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql
} }
if err != nil { if err != nil {
l.gLog.Warn("gorm", l.gLog.Warn("[gorm]",
zap.Error(err), zap.Error(err),
zap.String("sql", sql), zap.String("sql", sql),
rowsField, rowsField,
...@@ -108,7 +108,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql ...@@ -108,7 +108,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql
} }
if l.logLevel >= logger.Info { if l.logLevel >= logger.Info {
l.gLog.Info("gorm", l.gLog.Info("[gorm]",
zap.String("sql", sql), zap.String("sql", sql),
rowsField, rowsField,
zap.String("cost", cost), zap.String("cost", cost),
...@@ -119,7 +119,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql ...@@ -119,7 +119,7 @@ func (l *gormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql
} }
if l.logLevel >= logger.Warn { if l.logLevel >= logger.Warn {
l.gLog.Warn("gorm", l.gLog.Warn("[gorm]",
zap.String("sql", sql), zap.String("sql", sql),
rowsField, rowsField,
zap.String("cost", cost), zap.String("cost", cost),
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论