gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

允许renew之前没有设置超时的配置，重复增删导致的Maat_set_lines失败不再assert。

Browse Source
This commit is contained in:
zhengchao
2018-11-20 20:43:41 +08:00
parent d02add1a2f
commit eeb5fa279f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entry/Maat_command.cpp
View File

@@ -1181,8 +1181,7 @@ void _exec_serial_rule(redisContext* ctx, long long version, struct serial_rule_
continue; continue;
} }
//s_rule[i].timeout>0 was checked by caller. //s_rule[i].timeout>0 was checked by caller.
//XX: Only update elements that already exist. Never add elements. redisAppendCommand(ctx,"ZADD %s %lld %s,%d",rm_expire_sset
redisAppendCommand(ctx,"ZADD %s XX %lld %s,%d",rm_expire_sset
,s_rule[i].timeout ,s_rule[i].timeout
,s_rule[i].table_name ,s_rule[i].table_name
,s_rule[i].rule_id); ,s_rule[i].rule_id);
@@ -2074,12 +2073,11 @@ int Maat_cmd_set_lines(Maat_feather_t feather,const struct Maat_line_t** line_ru
} }
set_serial_rule(s_rule+i, op,line_rule[i]->rule_id,line_rule[i]->label_id,line_rule[i]->table_name,line_rule[i]->table_line, absolute_expire_time); set_serial_rule(s_rule+i, op,line_rule[i]->rule_id,line_rule[i]->label_id,line_rule[i]->table_name,line_rule[i]->table_line, absolute_expire_time);
} }
success_cnt=exec_serial_rule(_feather->redis_write_ctx,s_rule, line_num,server_time,_feather->logger); success_cnt=exec_serial_rule(_feather->redis_write_ctx,s_rule, line_num,server_time,_feather->logger);
if(success_cnt<0||success_cnt!=line_num)//error if(success_cnt<0||success_cnt!=line_num)//error
{ {
ret=-1; ret=-1;
goto error_out; goto error_out;
}
} }
ret=success_cnt; ret=success_cnt;
_feather->line_cmd_acc_num+=success_cnt; _feather->line_cmd_acc_num+=success_cnt;

2
src/entry/Maat_rule.cpp
View File

@@ -32,7 +32,7 @@
#include "stream_fuzzy_hash.h" #include "stream_fuzzy_hash.h"
#include "gram_index_engine.h" #include "gram_index_engine.h"
int MAAT_FRAME_VERSION_2_4_20181115=1; int MAAT_FRAME_VERSION_2_4_20181120=1;
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};