redis: add extra info to connection log

diff --git a/src/knot/common/hiredis.c b/src/knot/common/hiredis.c
index 631fe2533dd68a473762ae113ff6230f1bc579be..3bbf6d968a124db01f03e579395cedfabdf86150 100644 (file)
--- 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 9b9f3f078e9c9b5be32d851bd44b5be7a28faa48..40e9a4a7cefebc0e4a9e00f8fcaf22e4e60d1a38 100644 (file)
--- 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 cedb88b3adf191bc2318cdefdd28bf9f28de0355..32af116ca766618411293dae0c7e6a3c1e90282c 100644 (file)
--- 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 bc14a330cc997fd88a9204e5eb32e781e04e64fb..546c1034c8f659645c72466e842911afebd55d99 100644 (file)
--- 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)