From e4d28d81b75072e8e3ad23ca8fabd90c148f404f Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Wed, 26 Nov 2025 13:28:12 +0100 Subject: [PATCH] redis: add extra info to connection log --- src/knot/common/hiredis.c | 4 ++-- src/knot/common/hiredis.h | 2 +- src/knot/server/server.c | 4 ++-- src/knot/zone/redis.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/knot/common/hiredis.c b/src/knot/common/hiredis.c index 631fe2533d..3bbf6d968a 100644 --- a/src/knot/common/hiredis.c +++ b/src/knot/common/hiredis.c @@ -309,7 +309,7 @@ static int get_master(redisContext *rdb, char *out, size_t out_len, int *port) return KNOT_EOK; } -redisContext *rdb_connect(conf_t *conf, bool require_master) +redisContext *rdb_connect(conf_t *conf, bool require_master, const char *info) { int port = 0; int role = -1; @@ -371,7 +371,7 @@ connected: #ifdef ENABLE_REDIS_TLS tls = rdb->privctx != NULL; #endif // ENABLE_REDIS_TLS - log_debug("rdb, connected, remote %s%s%.0u%s%s%s", + log_debug("rdb, connected%s, remote %s%s%.0u%s%s%s", info, (tcp ? rdb->tcp.host : rdb->unix_sock.path), (tcp ? "@" : ""), (tcp ? rdb->tcp.port : 0), diff --git a/src/knot/common/hiredis.h b/src/knot/common/hiredis.h index 9b9f3f078e..40e9a4a7ce 100644 --- a/src/knot/common/hiredis.h +++ b/src/knot/common/hiredis.h @@ -15,7 +15,7 @@ int rdb_addr_to_str(struct sockaddr_storage *addr, char *out, size_t out_len, int *port); -redisContext *rdb_connect(conf_t *conf, bool require_master); +redisContext *rdb_connect(conf_t *conf, bool require_master, const char *info); void rdb_disconnect(redisContext *rdb, bool pool_save); diff --git a/src/knot/server/server.c b/src/knot/server/server.c index cedb88b3ad..32af116ca7 100644 --- a/src/knot/server/server.c +++ b/src/knot/server/server.c @@ -945,9 +945,9 @@ static int rdb_listener_run(struct dthread *thread) while (thread->state & ThreadActive) { if (s->rdb_ctx == NULL) { - s->rdb_ctx = rdb_connect(conf(), false); + s->rdb_ctx = rdb_connect(conf(), false, " events"); if (s->rdb_ctx == NULL) { - log_error("rdb, failed to connect to read events"); + log_error("rdb, failed to connect events"); sleep(2); continue; } else if (!rdb_compatible(s->rdb_ctx)) { diff --git a/src/knot/zone/redis.c b/src/knot/zone/redis.c index bc14a330cc..546c1034c8 100644 --- a/src/knot/zone/redis.c +++ b/src/knot/zone/redis.c @@ -17,7 +17,7 @@ struct redisContext *zone_redis_connect(conf_t *conf, bool require_master) { - return rdb_connect(conf, require_master); + return rdb_connect(conf, require_master, require_master ? " worker writer" : " worker reader"); } void zone_redis_disconnect(struct redisContext *ctx, bool pool_save) -- 2.47.3