diff --git a/README.md b/README.md index 47ce440..8b0c473 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Add tag when releasing: "release-v{version}-{date}". for example: "release-v1.0. --- * git clone https://github.com/aliyun/redis-shake.git * cd redis-shake/src/vendor -* GOPATH=\`pwd\`/../..; govendor sync #please note: must install govendor first and then pull all dependencies +* GOPATH=\`pwd\`/../..; govendor sync #please note: must install govendor first and then pull all dependencies: `go get -u github.com/kardianos/govendor` * cd ../../ && ./build.sh * ./bin/collector -type=$(type_must_be_sync_dump_restore_or_decode) -conf=conf/redis-shake.conf #please note: user must modify collector.conf first to match needs. diff --git a/build.sh b/build.sh index f20416e..48e9af0 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set -o errexit diff --git a/conf/redis-shake.conf b/conf/redis-shake.conf index 65f5b6f..ed46eb3 100644 --- a/conf/redis-shake.conf +++ b/conf/redis-shake.conf @@ -32,7 +32,7 @@ output_rdb = local_dump # 源redis地址 source.address = 127.0.0.1:20441 # password. -source.password_raw = kLNIl691OZctWST +source.password_raw = 123456 # auth type, don't modify it source.auth_type = auth # version number, default is 6 (6 for Redis Version <= 3.0.7, 7 for >=3.2.0) @@ -42,9 +42,9 @@ source.version = 6 # used in `restore` and `sync`. # ip:port # 目的redis地址 -target.address = 10.101.72.137:20551 +target.address = 127.0.0.1:20551 # password. -target.password_raw = kLNIl691OZctWST +target.password_raw = 123456 # auth type, don't modify it target.auth_type = auth # version number, default is 6 (6 for Redis Version <= 3.0.7, 7 for >=3.2.0) @@ -100,7 +100,8 @@ metric.print_log = true # send heartbeat to this url # used in `sync`. # 心跳的url地址,redis-shake将会发送到这个地址 -heartbeat.url = http://127.0.0.1:8000 +#heartbeat.url = http://127.0.0.1:8000 +heartbeat.url = # interval by seconds # 心跳保活周期 heartbeat.interval = 3