From acefaf1d3c3f232a871ccb1e949a373477aa75ae Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 20 Jul 2021 14:35:22 -0400 Subject: [PATCH] TT#14008 report Redis errors on restore failures Change-Id: Id1090fe88d02896595ce4a45ac87953714e0d9d1 --- daemon/redis.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/daemon/redis.c b/daemon/redis.c index d039ba115..de332e746 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -1951,11 +1951,17 @@ err1: g_object_unref (parser); if (rr_jsonStr) freeReplyObject(rr_jsonStr); - log_info_clear(); if (err) { - rlog(LOG_WARNING, "Failed to restore call ID '" STR_FORMAT_M "' from Redis: %s", - STR_FMT_M(callid), - err); + mutex_lock(&r->lock); + if (r->ctx && r->ctx->err) + rlog(LOG_WARNING, "Failed to restore call ID '" STR_FORMAT_M "' from Redis: %s (%s)", + STR_FMT_M(callid), + err, r->ctx->errstr); + else + rlog(LOG_WARNING, "Failed to restore call ID '" STR_FORMAT_M "' from Redis: %s", + STR_FMT_M(callid), + err); + mutex_unlock(&r->lock); if (c) call_destroy(c); @@ -1971,6 +1977,7 @@ err1: } if (c) obj_put(c); + log_info_clear(); } struct thread_ctx {