diff options
| -rw-r--r-- | src/entry/Maat_api.cpp | 23 | ||||
| -rw-r--r-- | src/entry/Maat_command.cpp | 4 | ||||
| -rw-r--r-- | src/entry/Maat_rule.cpp | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/src/entry/Maat_api.cpp b/src/entry/Maat_api.cpp index 041850c..cae6fec 100644 --- a/src/entry/Maat_api.cpp +++ b/src/entry/Maat_api.cpp @@ -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); if(mr_ctx->read_ctx != NULL) { - redis_monitor_traverse(_feather->maat_version - ,mr_ctx - ,maat_start_cb - ,maat_update_cb - ,maat_finish_cb - , _feather - ,_feather->decrypt_key //Not used. - ,_feather); + redis_monitor_traverse(_feather->maat_version, + mr_ctx, + maat_start_cb, + maat_update_cb, + maat_finish_cb, + _feather, + _feather->decrypt_key, //Not used. + _feather); } if(_feather->update_tmp_scanner) { MESA_handle_runtime_log(_feather->logger,RLOG_LV_FATAL,maat_module , - "At initiation: no avilable rule in redis in %s:%hu" - ,mr_ctx->redis_ip - ,mr_ctx->redis_port); + "At initiation: no avilable rule in redis %s:%hu db%d", + mr_ctx->redis_ip, + mr_ctx->redis_port, + mr_ctx->redis_db); } break; case SOURCE_IRIS_FILE: diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index 753e99b..ebd6677 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -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"
{
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"
{
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);
}
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 988184b..803d70e 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -32,7 +32,7 @@ #include "stream_fuzzy_hash.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", "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; |