From 9a9eb7aa5b833a885393cbcdab6770f7f3d74764 Mon Sep 17 00:00:00 2001 From: vinllen Date: Mon, 19 Aug 2019 15:17:20 +0800 Subject: [PATCH] polish conf --- ChangeLog | 2 +- conf/redis-shake.conf | 3 ++- src/redis-shake/rump.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c96a717..a6159d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ #145. * IMPROVE: adjust RecvChanSize based on `sender.count` or `scan.key_number` if target redis type is cluster. - * IMPROVE: remove some useless variables in conf like `heartbeat`, `ncpu`. + * IMPROVE: remove some variables in conf like `heartbeat`, `ncpu`. * IMPROVE: print inner error message from redigo driver return message. 2019-08-09 Alibaba Cloud. * VERSION: 1.6.16 diff --git a/conf/redis-shake.conf b/conf/redis-shake.conf index 0d941a4..9a7f76e 100644 --- a/conf/redis-shake.conf +++ b/conf/redis-shake.conf @@ -38,7 +38,8 @@ source.type = standalone # 2. ${sentinel_master_name}:${master or slave}@sentinel single/cluster address, e.g., mymaster:master@127.0.0.1:26379;127.0.0.1:26380, or @127.0.0.1:26379;127.0.0.1:26380. for "sentinel" type. # 3. cluster that has several db nodes split by semicolon(;). for "cluster" type. e.g., 10.1.1.1:20331;10.1.1.2:20441. # 4. proxy address(used in "rump" mode only). for "proxy" type. -# 源redis地址。对于sentinel模式，输入格式为"master名字:拉取角色为master或者slave@sentinel的地址" +# 源redis地址。对于sentinel或者开源cluster模式，输入格式为"master名字:拉取角色为master或者slave@sentinel的地址"，别的cluster +# 架构，比如codis, twemproxy, aliyun proxy等需要配置所有master或者slave的db地址。 source.address = 127.0.0.1:20441 # password of db/proxy. even if type is sentinel. source.password_raw = 123456 diff --git a/src/redis-shake/rump.go b/src/redis-shake/rump.go index a921fcb..c6a0db4 100644 --- a/src/redis-shake/rump.go +++ b/src/redis-shake/rump.go @@ -13,9 +13,9 @@ import ( "redis-shake/configure" "redis-shake/metric" "redis-shake/scanner" + "redis-shake/filter" "github.com/garyburd/redigo/redis" - "redis-shake/filter" ) type CmdRump struct {