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

增加Redis读取失败的出错处理，修复笔误导致的MAAT_UPDATE_STATUS淘汰未生效。

Browse Source
This commit is contained in:
zhengchao
2017-08-15 09:14:44 +08:00
parent 94f69b0f6d
commit caf26c0112
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/entry/Maat_rule.cpp
View File

@@ -28,7 +28,7 @@
#include "stream_fuzzy_hash.h"
#include "gram_index_engine.h"
int MAAT_FRAME_VERSION_2_0_20170811=1;
int MAAT_FRAME_VERSION_2_0_20170814_2=1;
const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
@@ -1974,6 +1974,7 @@ int add_digest_rule(struct _Maat_table_info_t* table,struct db_digest_rule_t* db
,db_digest_rule->confidence_degree
,group_rule);
MESA_lqueue_join_tail(scanner->gie_aux[table->table_id].update_q, &digest_rule, sizeof(void*));
scanner->gie_total_q_size++;
return 0;
}
int del_region_rule(struct _Maat_table_info_t* table,int region_id,int group_id,int rule_type,struct _Maat_scanner_t *maat_scanner,void* logger)
@@ -2026,6 +2027,7 @@ int del_region_rule(struct _Maat_table_info_t* table,int region_id,int group_id,
,0
,NULL);
MESA_lqueue_join_tail(maat_scanner->gie_aux[i].update_q,&digest_rule, sizeof(void*));
maat_scanner->gie_total_q_size++;
break;
default:
assert(0);
@@ -2925,6 +2927,7 @@ void do_scanner_update(struct _Maat_scanner_t* scanner,MESA_lqueue_head garbage_
,scanner
,i);
}
scanner->gie_total_q_size=0;
if(scanner->tmp_district_map!=NULL)
{
tmp_map=scanner->district_map;
@@ -3011,6 +3014,7 @@ void maat_finish_cb(void* u_para)
struct _Maat_feather_t *feather=(struct _Maat_feather_t *)u_para;
struct _Maat_table_info_t* p_table=NULL;
struct _plugin_table_info* p_table_cb=NULL;
long expr_wait_q_cnt=0;
int i=0,j=0,total=0;
for(i=0;i<MAX_TABLE_NUM;i++)
{
@@ -3052,6 +3056,8 @@ void maat_finish_cb(void* u_para)
{
feather->scanner->cfg_num=total;
feather->scanner->version=feather->maat_version;
expr_wait_q_cnt=MESA_lqueue_get_count(feather->scanner->region_update_q);
feather->postpone_q_size=expr_wait_q_cnt+feather->scanner->gie_total_q_size;
if(time(NULL)-feather->scanner->last_update_time>feather->effect_interval_ms/1000)
{
do_scanner_update(feather->scanner
@@ -3061,6 +3067,7 @@ void maat_finish_cb(void* u_para)
MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module,
"Inc config version %u build complete,%d entries in total.",
feather->scanner->version,feather->scanner->cfg_num);
feather->postpone_q_size=0;
}
else
{
@@ -3208,8 +3215,8 @@ void *thread_rule_monitor(void *arg)
if(feather->scanner!=NULL)
{
expr_wait_q_cnt=MESA_lqueue_get_count(feather->scanner->region_update_q);
feather->postpone_q_size=expr_wait_q_cnt;
if(expr_wait_q_cnt>0&&time(NULL)-feather->scanner->last_update_time>feather->effect_interval_ms/1000)
feather->postpone_q_size=expr_wait_q_cnt+feather->scanner->gie_total_q_size;
if(feather->postpone_q_size>0&&time(NULL)-feather->scanner->last_update_time>feather->effect_interval_ms/1000)
{
do_scanner_update(feather->scanner
,feather->garbage_q