summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorzhengchao <[email protected]>2020-09-30 15:48:34 +0800
committerzhengchao <[email protected]>2020-09-30 15:48:34 +0800
commit807ffd42706e50065b86419683483ea4437401fb (patch)
treeec78a9430d6d8c7d891e594d33b79273497adbf5 /tools
parent2f45768d2af908c3e37ad1ef1164de386b3689fc (diff)
加载全量配置读取value时,如key中不包含生效的table name则不加载。
Diffstat (limited to 'tools')
-rw-r--r--tools/maat_redis_tool.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/maat_redis_tool.cpp b/tools/maat_redis_tool.cpp
index 9ff0240..aff81b0 100644
--- a/tools/maat_redis_tool.cpp
+++ b/tools/maat_redis_tool.cpp
@@ -34,10 +34,12 @@ static int compare_serial_rule(const void *a, const void *b)
struct serial_rule_t *ra=(struct serial_rule_t *)a;
struct serial_rule_t *rb=(struct serial_rule_t *)b;
- char p_str[256],q_str[256];
- snprintf(p_str,sizeof(p_str),"%s.%ld",ra->table_name,ra->rule_id);
- snprintf(q_str,sizeof(q_str),"%s.%ld",rb->table_name,rb->rule_id);
- return strcmp(p_str,q_str);
+ int ret=strcmp(ra->table_name, rb->table_name);
+ if(ret==0)
+ {
+ ret= ra->rule_id - rb->rule_id;
+ }
+ return ret;
}
void read_rule_from_redis(redisContext * ctx, long long desire_version, const char* output_path ,void*logger)
@@ -51,7 +53,7 @@ void read_rule_from_redis(redisContext * ctx, long long desire_version, const ch
char table_path[256],index_path[256];
FILE *table_fp=NULL, *index_fp=NULL;
- rule_num=get_rm_key_list(ctx, 0, desire_version, &version, &rule_list, &update_type, logger,0);
+ rule_num=get_rm_key_list(ctx, 0, desire_version, &version, NULL, &rule_list, &update_type, logger,0);
if(rule_num==0)
{
if(desire_version!=0)