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

HEAD object元信息来源选择由宏定义改为配置文件。

Browse Source
This commit is contained in:
zhangchengwei
2018-10-24 12:03:21 +08:00
committed by zhengchao
parent e65f0150b8
commit 268e1b8689
12 changed files with 71 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cache/src/tango_cache_redis.cpp vendored
View File

@@ -70,9 +70,9 @@ void redis_asyn_connect_cb(const struct redisAsyncContext *ac, int status)
}
}
int redis_asyn_connect_init(struct tango_cache_instance *instance, const char *redisip, int redis_port)
int redis_asyn_connect_init(struct tango_cache_instance *instance)
{
instance->redis_ac = redisAsyncConnect(redisip, redis_port);
instance->redis_ac = redisAsyncConnect(instance->redis_ip, instance->redis_port);
if(instance->redis_ac == NULL)
{
return -1;
@@ -226,10 +226,10 @@ int tango_cache_head_redis(struct tango_cache_ctx *ctx)
case CACHE_REDIS_CONNECTED:
ret = redisAsyncCommand(ctx->instance->redis_ac, redis_hget_command_cb, ctx, "HGET %s %s/%s",
ctx->instance->redis_key, ctx->instance->bucketname, ctx->object_key);
if(ret < 0)
if(ret != REDIS_OK)
{
//redisAsyncDisconnect(ctx->instance->redis_ac);
redis_asyn_connect_init(ctx->instance, ctx->instance->redis_ip, ctx->instance->redis_port);
redis_asyn_connect_init(ctx->instance);
tango_cache_set_fail_state(ctx, CACHE_ERR_REDIS_CONNECT);
promise_failed(future_to_promise(ctx->future), FUTURE_ERROR_CANCEL, tango_cache_get_errstring(ctx));
tango_cache_ctx_destroy(ctx);
@@ -237,7 +237,7 @@ int tango_cache_head_redis(struct tango_cache_ctx *ctx)
break;
case CACHE_REDIS_DISCONNECTED:
case CACHE_REDIS_CONNECT_IDLE:
redis_asyn_connect_init(ctx->instance, ctx->instance->redis_ip, ctx->instance->redis_port);
redis_asyn_connect_init(ctx->instance);
case CACHE_REDIS_CONNECTING:
tango_cache_set_fail_state(ctx, CACHE_ERR_REDIS_CONNECT);
promise_failed(future_to_promise(ctx->future), FUTURE_ERROR_CANCEL, tango_cache_get_errstring(ctx));