From dc3e9b26c8da3921e3f7763ff7809c07a3de6529 Mon Sep 17 00:00:00 2001 From: yuqing Date: Sat, 5 Sep 2015 19:45:42 +0800 Subject: [PATCH] use libfastcommon v1.21 --- HISTORY | 4 ++-- conf/storage.conf | 7 +++++-- conf/tracker.conf | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 87bae49..80c8264 100644 --- a/HISTORY +++ b/HISTORY @@ -1,7 +1,7 @@ -Version 5.07 2015-08-17 +Version 5.07 2015-09-05 * schedule task add the "second" field - * make.sh changed, you must upgrade libfastcommon to V1.20 or later + * make.sh changed, you must upgrade libfastcommon to V1.21 or later * bug fixed: storage_disk_recovery.c skip the first file (binlog first line) * bug fixed: should close connection after fetch binlog * fdfs_storaged.c: advance the position of daemon_init diff --git a/conf/storage.conf b/conf/storage.conf index e93a071..5b98ae9 100644 --- a/conf/storage.conf +++ b/conf/storage.conf @@ -137,10 +137,13 @@ run_by_group= run_by_user= # allow_hosts can ocur more than once, host can be hostname or ip address, -# "*" means match all ip addresses, can use range like this: 10.0.1.[1-15,20] or -# host[01-08,20-25].domain.com, for example: +# "*" (only one asterisk) means match all ip addresses +# we can use CIDR ips like 192.168.5.64/26 +# and also use range like these: 10.0.1.[0-254] and host[01-08,20-25].domain.com +# for example: # allow_hosts=10.0.1.[1-15,20] # allow_hosts=host[01-08,20-25].domain.com +# allow_hosts=192.168.5.64/26 allow_hosts=* # the mode of the files distributed to the data path diff --git a/conf/tracker.conf b/conf/tracker.conf index 6427f13..9925a16 100644 --- a/conf/tracker.conf +++ b/conf/tracker.conf @@ -92,10 +92,13 @@ run_by_group= run_by_user= # allow_hosts can ocur more than once, host can be hostname or ip address, -# "*" means match all ip addresses, can use range like this: 10.0.1.[1-15,20] or -# host[01-08,20-25].domain.com, for example: +# "*" (only one asterisk) means match all ip addresses +# we can use CIDR ips like 192.168.5.64/26 +# and also use range like these: 10.0.1.[0-254] and host[01-08,20-25].domain.com +# for example: # allow_hosts=10.0.1.[1-15,20] # allow_hosts=host[01-08,20-25].domain.com +# allow_hosts=192.168.5.64/26 allow_hosts=* # sync log buff to disk every interval seconds