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

进一步完善redis不可用时的错误处理

Browse Source
This commit is contained in:
zhengchao
2018-10-18 19:43:54 +08:00
parent 3e2fd28cd0
commit f7500b9960
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/entry/Maat_command.cpp
View File

@@ -376,6 +376,10 @@ int get_inc_key_list(long long instance_version, long long target_version, redis
nearest_rule_version=read_redis_integer(tmp_reply); nearest_rule_version=read_redis_integer(tmp_reply);
freeReplyObject(tmp_reply); freeReplyObject(tmp_reply);
tmp_reply=NULL; tmp_reply=NULL;
if(nearest_rule_version<0)
{
return -1;
}
if(nearest_rule_version!=instance_version+1) if(nearest_rule_version!=instance_version+1)
{ {
MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor,
@@ -516,6 +520,15 @@ int get_rm_key_list(redisContext *c, long long instance_version, long long desir
return -1; return -1;
} }
redis_version=read_redis_integer(reply); redis_version=read_redis_integer(reply);
if(redis_version<0)
{
if(reply->type==REDIS_REPLY_ERROR)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_redis_monitor,
"Redis Communication error: %s.",reply->str);
}
return -1;
}
freeReplyObject(reply); freeReplyObject(reply);
if(redis_version==instance_version) if(redis_version==instance_version)
{ {