diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/conf/mctrl.conf | 8 | ||||
| -rw-r--r-- | bin/conf/table_info.conf | 40 | ||||
| -rw-r--r-- | bin/ir_mctrl | bin | 48888 -> 0 bytes | |||
| -rw-r--r-- | bin/mctrl | bin | 44344 -> 44640 bytes | |||
| -rw-r--r-- | bin/mctrl_r2 | 4 | ||||
| -rw-r--r-- | bin/mctrl_r3 | 4 |
6 files changed, 14 insertions, 42 deletions
diff --git a/bin/conf/mctrl.conf b/bin/conf/mctrl.conf index 3a5d955..7d2c3d6 100644 --- a/bin/conf/mctrl.conf +++ b/bin/conf/mctrl.conf @@ -4,22 +4,22 @@ max_thread_num=1 logger_level=30 logger_path=./log/ir_mctrl.log -[Mctrl_D] +[Mctrl_DYNAMIC] Maat_redis_ip=192.168.11.243 Maat_redis_port=6800 Maat_redis_index=1 -[Mctrl_S] +[Mctrl_STATIC] Maat_redis_ip=192.168.11.243 Maat_redis_port=6379 Maat_redis_index=6 -[Mctrl_I] +[Mctrl_INTERCEPT] Maat_redis_ip=192.168.11.243 Maat_redis_port=6800 Maat_redis_index=1 -[Mctrl_N] +[Mctrl_NOMINEE] Maat_redis_ip=192.168.11.243 Maat_redis_port=6800 Maat_redis_index=5 diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf index b1efd85..be3c64c 100644 --- a/bin/conf/table_info.conf +++ b/bin/conf/table_info.conf @@ -1,5 +1,5 @@ #each collumn seperate with '\t' -#id (0~65535) +#id (0~65535) #name string #type one of ip,expr,expr_plus,digest,intval,compile or plugin #src_charset one of GBK,BIG5,UNICODE,UTF8 @@ -7,37 +7,17 @@ #do_merege [yes/no] #cross cache [number] #quick mode [quickon/quickoff], default [quickoff] -<<<<<<< HEAD #For ip/intval/digest/compile/group table. -#id name type +#id name type # #For plugin table. The first column's id is 1. 0 as not speicified. -#id name type column_define +#id name type column_define # #For expr/expr_plus Table -#id name type src_charset dst_charset do_merge cross_cache quick_mode -0 IR_STATIC_NOMINEE_IP plugin {"key":1,"valid":15} -- -1 IR_DYNAMIC_NOMINEE_IP plugin {"key":1,"valid":9} -- -2 IR_DNAT_POLICY plugin {"key":1,"valid":12} -- -3 IR_NOMINEE_IP plugin {"key":1,"valid":5} -- -4 IR_INTERCEPT_IP plugin {"key":1,"valid":14} -- -5 IR_CANDIDATE_IP plugin {"key":1,"valid":6} -- -======= -#For ip/intval/digest/compile/group -#id name type -# -#For plugin table -#id name type valid_column -# -#For expr/expr_plus Table -#id name type src_charset dst_charset do_merge cross_cache quick_mode -0 IR_STATIC_NOMINEE_IP plugin 15 -- -1 IR_DYNAMIC_NOMINEE_IP plugin 9 -- -2 IR_DNAT_POLICY plugin 12 -- -3 IR_INTERCEPT_IP plugin 14 -- -4 IR_NOMINEE_IP plugin 5 -- -5 IR_CANDIDATE_IP plugin 6 -- - - ->>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 - +#id name type src_charset dst_charset do_merge cross_cache quick_mode +0 IR_STATIC_NOMINEE_IP plugin {"key":1,"valid":15} -- +1 IR_DYNAMIC_NOMINEE_IP plugin {"key":1,"valid":9} -- +2 IR_DNAT_POLICY plugin {"key":1,"valid":12} -- +3 IR_NOMINEE_IP plugin {"key":1,"valid":5} -- +4 IR_INTERCEPT_IP plugin {"key":1,"valid":14} -- +5 IR_CANDIDATE_IP plugin {"key":1,"valid":6} -- diff --git a/bin/ir_mctrl b/bin/ir_mctrl Binary files differBinary files differdeleted file mode 100644 index 24c655c..0000000 --- a/bin/ir_mctrl +++ /dev/null diff --git a/bin/mctrl_r2 b/bin/mctrl_r2 index 595546b..485bd0e 100644 --- a/bin/mctrl_r2 +++ b/bin/mctrl_r2 @@ -1,8 +1,4 @@ -<<<<<<< HEAD killall mctrl_r3 mctrl -======= -killall mctrl_r3 ir_mctrl ->>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 ./mctrl_r3 &> /dev/null & #./kill_sapp_by_mem.sh &> /dev/null & diff --git a/bin/mctrl_r3 b/bin/mctrl_r3 index 6928cb5..2373dd4 100644 --- a/bin/mctrl_r3 +++ b/bin/mctrl_r3 @@ -11,11 +11,7 @@ while [ 1 ]; do ulimit -c 0 fi -<<<<<<< HEAD ./mctrl > /dev/null -======= - ./ir_mctrl > /dev/null ->>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log sleep 10 done |