diff options
| author | jixinyi <[email protected]> | 2019-01-18 16:37:51 +0800 |
|---|---|---|
| committer | jixinyi <[email protected]> | 2019-01-18 16:37:51 +0800 |
| commit | 2e83f0db5a94ba44cbbcd9d41863215934a738c0 (patch) | |
| tree | 20c25957e655e18308b2ceb1285562874c9b89aa /bin | |
| parent | 6c370f68c7b54973f24558a7f51d6611337fc3e9 (diff) | |
| parent | 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 (diff) | |
重构调用maat新接口
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/conf/table_info.conf | 19 | ||||
| -rw-r--r-- | bin/ir_mctrl | bin | 0 -> 48888 bytes | |||
| -rw-r--r-- | bin/mctrl_r2 | 4 | ||||
| -rw-r--r-- | bin/mctrl_r3 | 4 |
4 files changed, 27 insertions, 0 deletions
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf index 78e1268..b1efd85 100644 --- a/bin/conf/table_info.conf +++ b/bin/conf/table_info.conf @@ -7,6 +7,7 @@ #do_merege [yes/no] #cross cache [number] #quick mode [quickon/quickoff], default [quickoff] +<<<<<<< HEAD #For ip/intval/digest/compile/group table. #id name type # @@ -21,4 +22,22 @@ 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 diff --git a/bin/ir_mctrl b/bin/ir_mctrl Binary files differnew file mode 100644 index 0000000..24c655c --- /dev/null +++ b/bin/ir_mctrl diff --git a/bin/mctrl_r2 b/bin/mctrl_r2 index 485bd0e..595546b 100644 --- a/bin/mctrl_r2 +++ b/bin/mctrl_r2 @@ -1,4 +1,8 @@ +<<<<<<< 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 2373dd4..6928cb5 100644 --- a/bin/mctrl_r3 +++ b/bin/mctrl_r3 @@ -11,7 +11,11 @@ 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 |