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

美化错误日志。

Browse Source
This commit is contained in:
zhengchao
2018-12-12 16:06:04 +06:00
parent 83e1fd227f
commit 9a65747853
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/entry/Maat_api.cpp
View File

@@ -721,21 +721,22 @@ void maat_read_full_config(_Maat_feather_t* _feather)
mr_ctx->read_ctx=connect_redis(mr_ctx->redis_ip, mr_ctx->redis_port, mr_ctx->redis_db, _feather->logger); mr_ctx->read_ctx=connect_redis(mr_ctx->redis_ip, mr_ctx->redis_port, mr_ctx->redis_db, _feather->logger);
if(mr_ctx->read_ctx != NULL) if(mr_ctx->read_ctx != NULL)
{ {
redis_monitor_traverse(_feather->maat_version redis_monitor_traverse(_feather->maat_version,
,mr_ctx mr_ctx,
,maat_start_cb maat_start_cb,
,maat_update_cb maat_update_cb,
,maat_finish_cb maat_finish_cb,
, _feather _feather,
,_feather->decrypt_key //Not used. _feather->decrypt_key, //Not used.
,_feather); _feather);
} }
if(_feather->update_tmp_scanner) if(_feather->update_tmp_scanner)
{ {
MESA_handle_runtime_log(_feather->logger,RLOG_LV_FATAL,maat_module , MESA_handle_runtime_log(_feather->logger,RLOG_LV_FATAL,maat_module ,
"At initiation: no avilable rule in redis in %s:%hu" "At initiation: no avilable rule in redis %s:%hu db%d",
,mr_ctx->redis_ip mr_ctx->redis_ip,
,mr_ctx->redis_port); mr_ctx->redis_port,
mr_ctx->redis_db);
} }
break; break;
case SOURCE_IRIS_FILE: case SOURCE_IRIS_FILE:

4
src/entry/Maat_command.cpp
View File

@@ -763,12 +763,12 @@ int _get_maat_redis_value(redisContext *c,struct serial_rule_t* rule_list,int ru
else if(reply->type==REDIS_REPLY_ERROR)//Deal with Redis response: "Loading Redis is loading the database in memory" else if(reply->type==REDIS_REPLY_ERROR)//Deal with Redis response: "Loading Redis is loading the database in memory"
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor
,"Redis cmd=%s Error, Reply type=%d, str=%s",redis_cmd, reply->type, reply->str); ,"redis command %s error, reply type=%d, error str=%s",redis_cmd, reply->type, reply->str);
} }
else //Handle type "nil" else //Handle type "nil"
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor
,"Redis cmd=%s Failed, Reply type=%d",redis_cmd, reply->type); ,"redis command %s failed, reply type=%d",redis_cmd, reply->type);
} }
freeReplyObject(reply); freeReplyObject(reply);
} }

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_5_20181211=1; int MAAT_FRAME_VERSION_2_5_20181212=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",""};