diff options
| author | lishu <[email protected]> | 2019-08-13 14:00:20 +0800 |
|---|---|---|
| committer | lishu <[email protected]> | 2019-08-13 14:00:20 +0800 |
| commit | e059cdc8e3472f245a741a26717215011b90ac24 (patch) | |
| tree | cd446be38cd1e1dff23ebc1912a4baf1a7b69b9a /src | |
| parent | 27ad481021f8891701e406eec2da93997247d1aa (diff) | |
MAAT增加redis版本
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/main.c | 27 |
2 files changed, 23 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 0fd2120..0370f66 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,7 +20,7 @@ LIB = -L./lib/ #LIB += -lssl -lcrypto -lxml2 -lcurl -levent -lpthread LIB += -lMESA_handle_logger -lMESA_prof_load -lmaatframe -lrulescan -lMESA_htable -lMESA_field_stat2 -lWiredLB -lpthread LIB += ./lib/libmy_socket.a -LIB += ./lib/libtango_cache_client.a ./lib/libcjson.a ./lib/libcrypto.a ./lib/libcurl.a ./lib/libevent.a ./lib/libhiredis.a ./lib/libssl.a ./lib/libxml2.a -lz +LIB += ./lib/libtango_cache_client.a ./lib/libhiredis_vip.a ./lib/libcjson.a ./lib/libcrypto.a ./lib/libcurl.a ./lib/libevent.a ./lib/libhiredis.a ./lib/libssl.a ./lib/libxml2.a -lz #LIB += ./lib/libdictator_debug.a LIB_FILE = $(wildcard ../lib/*.a) @@ -135,7 +135,10 @@ int read_conf_and_init(const char* filename) { char conf_buf[MAX_PATH_LEN]={0}; MESA_htable_create_args_t hash_args; - char table_info_filename [MAX_PATH_LEN]={0}; + char table_info_filename [MAX_PATH_LEN]={0}; + unsigned int maat_redis_switch = 1; + char maat_redis_ip[MAX_PATH_LEN] = {0}; + unsigned short maat_redis_port = 6379; char full_index[MAX_PATH_LEN]={0}; char inc_index[MAX_PATH_LEN]={0}; uint32_t hash_thread_safe = 512; @@ -204,11 +207,25 @@ int read_conf_and_init(const char* filename) return -1; } - /*maat��ʼ��*/ + /*maat��ʼ��*/ + MESA_load_profile_uint_def(filename, "MAAT", "MaatRedisSwitch", &maat_redis_switch,1); MESA_load_profile_string_def(filename,"MAAT","MaatTableInfo",table_info_filename,sizeof(table_info_filename),"./conf/table_info.conf"); - MESA_load_profile_string_def(filename,"MAAT","FullCfgDir",full_index,sizeof(full_index),"./conf/full/index/"); - MESA_load_profile_string_def(filename,"MAAT","IncCfgDir",inc_index,sizeof(inc_index),"./conf/inc/index/"); - g_dd_run.feather = Maat_summon_feather(g_dd_cfg.thread_num,table_info_filename,full_index,inc_index,g_dd_run.logger); + g_dd_run.feather = Maat_feather(g_dd_cfg.thread_num, table_info_filename, g_dd_run.logger); + if(maat_redis_switch) + { + MESA_load_profile_string_def(filename,"MAAT","MaatRedisIP",maat_redis_ip,sizeof(maat_redis_ip),""); + MESA_load_profile_short_def(filename, "MAAT", "MaatRedisPort", (short*)&maat_redis_port,6379); + Maat_set_feather_opt(g_dd_run.feather, MAAT_OPT_REDIS_IP, maat_redis_ip, strlen(maat_redis_ip)+1); + Maat_set_feather_opt(g_dd_run.feather, MAAT_OPT_REDIS_PORT, &maat_redis_port, sizeof(maat_redis_port)); + } + else + { + MESA_load_profile_string_def(filename,"MAAT","FullCfgDir",full_index,sizeof(full_index),"./conf/full/index/"); + MESA_load_profile_string_def(filename,"MAAT","IncCfgDir",inc_index,sizeof(inc_index),"./conf/inc/index/"); + Maat_set_feather_opt(g_dd_run.feather, MAAT_OPT_FULL_CFG_DIR, full_index, strlen(full_index)+1); + Maat_set_feather_opt(g_dd_run.feather, MAAT_OPT_INC_CFG_DIR, inc_index, strlen(inc_index)+1); + } + Maat_initiate_feather(g_dd_run.feather); g_dd_run.digest_tableid = Maat_table_register(g_dd_run.feather,MM_FILE_DIGEST_TABLENAME); /*recv data*/ |