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

初始化时在日志中打印accept tags。

Browse Source
This commit is contained in:
zhengchao
2018-12-23 18:18:19 +06:00
parent 41b6e3454b
commit 08ccb051f8
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/entry/Maat_api.cpp
View File

@@ -689,6 +689,7 @@ int Maat_set_feather_opt(Maat_feather_t feather,enum MAAT_INIT_OPT type,const vo
{ {
return -1; return -1;
} }
_feather->accept_tags_raw=_maat_strdup((const char*) value);
break; break;
case MAAT_OPT_FOREIGN_CONT_DIR: case MAAT_OPT_FOREIGN_CONT_DIR:
memset(_feather->foreign_cont_dir, 0, sizeof(_feather->foreign_cont_dir)); memset(_feather->foreign_cont_dir, 0, sizeof(_feather->foreign_cont_dir));
@@ -809,10 +810,14 @@ int Maat_initiate_feather(Maat_feather_t feather)
} }
if(_feather->cumulative_update_off==1) if(_feather->cumulative_update_off==1)
{ {
MESA_handle_runtime_log(_feather->logger,RLOG_LV_INFO,maat_module , MESA_handle_runtime_log(_feather->logger,RLOG_LV_INFO,maat_module ,
"Update with cumulative version OFF."); "Update with cumulative version OFF.");
} }
if(_feather->n_tags>0)
{
MESA_handle_runtime_log(_feather->logger,RLOG_LV_INFO,maat_module ,
"Accept tags: %s", _feather->accept_tags_raw);
}
if(_feather->stat_on==1) if(_feather->stat_on==1)
{ {
maat_stat_init(_feather); maat_stat_init(_feather);

3
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_5_20181221=1; int MAAT_FRAME_VERSION_2_5_20181223=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",""};
@@ -3744,6 +3744,7 @@ void *thread_rule_monitor(void *arg)
free(feather->accept_tags[i].tag_val); free(feather->accept_tags[i].tag_val);
} }
free(feather->accept_tags); free(feather->accept_tags);
free(feather->accept_tags_raw);
if(feather->stat_on&& feather->stat_handle) if(feather->stat_on&& feather->stat_handle)
{ {
FS_stop(&(feather->stat_handle)); FS_stop(&(feather->stat_handle));

2
src/inc_internal/Maat_rule_internal.h
View File

@@ -363,8 +363,10 @@ struct _Maat_feather_t
long long base_rgn_seq,base_grp_seq,server_time; long long base_rgn_seq,base_grp_seq,server_time;
long long load_version_from; long long load_version_from;
char* accept_tags_raw;
struct rule_tag *accept_tags; struct rule_tag *accept_tags;
int n_tags; int n_tags;
char foreign_cont_dir[MAX_TABLE_NAME_LEN]; char foreign_cont_dir[MAX_TABLE_NAME_LEN];
int foreign_cont_linger; int foreign_cont_linger;
//internal states //internal states

13
test/reset_redis4maat.sh
View File

@@ -1,10 +1,11 @@
#!/bin/sh #!/bin/sh
host="127.0.0.1" host="127.0.0.1"
port="6379" port="6379"
db="0"
echo "Reseting Redis For Maat..." echo "Reseting Redis For Maat..."
redis-cli -h $host -p $port GET MAAT_VERSION redis-cli -h $host -p $port -n $db GET MAAT_VERSION
redis-cli -h $host -p $port FLUSHALL redis-cli -h $host -p $port -n $db FLUSHALL
redis-cli -h $host -p $port SET MAAT_VERSION "0" redis-cli -h $host -p $port -n $db SET MAAT_VERSION "0"
redis-cli -h $host -p $port SET MAAT_PRE_VER "0" redis-cli -h $host -p $port -n $db SET MAAT_PRE_VER "0"
redis-cli -h $host -p $port SET SEQUENCE_REGION "1" redis-cli -h $host -p $port -n $db SET SEQUENCE_REGION "1"
redis-cli -h $host -p $port SET SEQUENCE_GROUP "1" redis-cli -h $host -p $port -n $db SET SEQUENCE_GROUP "1"