diff --git a/debian/patches/series b/debian/patches/series index ab8e2a426..3ec06289d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -79,6 +79,8 @@ upstream/utils-kamctl-dbtextdb.py-close-previous-opened-file-.patch ### active development sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch sipwise/pua_dialoginfo-local_identity_dlg_var.patch +# +sipwise/ndb_redis-fix-return-redis_cmd-function.patch ### Don't just put stuff in any order ### use gbp pq import/export tooling to help maintain patches ### diff --git a/debian/patches/sipwise/ndb_redis-fix-return-redis_cmd-function.patch b/debian/patches/sipwise/ndb_redis-fix-return-redis_cmd-function.patch new file mode 100644 index 000000000..24320d207 --- /dev/null +++ b/debian/patches/sipwise/ndb_redis-fix-return-redis_cmd-function.patch @@ -0,0 +1,42 @@ +From: Victor Seva +Date: Wed, 22 Apr 2020 14:12:54 +0200 +Subject: ndb_redis: fix return redis_cmd function + +return error if command execution fails +--- + src/modules/ndb_redis/redis_client.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c +index a453180..acdc978 100644 +--- a/src/modules/ndb_redis/redis_client.c ++++ b/src/modules/ndb_redis/redis_client.c +@@ -953,6 +953,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) + goto error_exec; + } + } ++ ++ LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); ++ if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { ++ LM_ERR("Redis error:%.*s\n", ++ (int)rpl->rplRedis->len, rpl->rplRedis->str); ++ goto error_exec; ++ } ++ + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { + LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); + if(rsrv->ctxRedis==NULL) +@@ -987,6 +995,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) + goto error_exec; + } + } ++ ++ LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); ++ if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { ++ LM_ERR("Redis error:%.*s\n", ++ (int)rpl->rplRedis->len, rpl->rplRedis->str); ++ goto error_exec; ++ } + } + cmd->s[cmd->len] = c; + rsrv->disable.consecutive_errors = 0;