From cdba1add45704ff3a3020ff07f3ebbffd092bb66 Mon Sep 17 00:00:00 2001
From: zhengchao <zhengchao@iie.ac.cn>
Date: Tue, 29 Aug 2017 10:16:10 +0800
Subject: [PATCH] =?UTF-8?q?redis=E7=9A=84=E6=9C=80=E5=A4=A7=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=B0=83=E6=95=B4=E4=B8=BA1024=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=9B=A0=E4=BA=8B=E5=8A=A1=E9=A2=91=E7=B9=81=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BDexpire?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entry/Maat_command.cpp | 4 ++--
 src/entry/Maat_rule.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp
index 64e79f8..1482f70 100644
--- a/src/entry/Maat_command.cpp
+++ b/src/entry/Maat_command.cpp
@@ -733,7 +733,7 @@ int mr_transaction_success(redisReply* data_reply)
 int _exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule,int serial_rule_num, long long server_time);
 int exec_serial_rule(redisContext* ctx,struct serial_rule_t* s_rule,int serial_rule_num, long long server_time)
 {
-	int max_redis_batch=8*1024,batch_cnt=0;
+	int max_redis_batch=1*1024,batch_cnt=0;
 	int success_cnt=0,ret=0;
 	while(success_cnt<serial_rule_num)
 	{
@@ -909,7 +909,7 @@ void check_maat_expiration(redisContext *ctx, void *logger)
 	else
 	{
 		MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor 
-				,"Failed to expired %d rules in Redis, try later.", s_rule_num);
+				,"Failed to expired %d/%d rules in Redis, try later.", s_rule_num-success_cnt,s_rule_num);
 	}
 
 	free(s_rule);
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp
index 0202c32..28e5931 100644
--- a/src/entry/Maat_rule.cpp
+++ b/src/entry/Maat_rule.cpp
@@ -28,7 +28,7 @@
 #include "stream_fuzzy_hash.h"
 #include "gram_index_engine.h"
 
-int MAAT_FRAME_VERSION_2_0_20170825=1;
+int MAAT_FRAME_VERSION_2_0_20170829=1;
 const char *maat_module="MAAT Frame";
 
 const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",