Replace connAddr with connAddrPeerName; Wrap logging with verbosity check

Signed-off-by: Zhijun <dszhijun@gmail.com>

Author: zhijun42

src/cluster_legacy.c

@@ -1696,14 +1696,16 @@ void setClusterNodeToInboundClusterLink(clusterNode *node, clusterLink *link) {
     serverAssert(!node->inbound_link);
     node->inbound_link = link;
     link->node = node;
-    char ip[NET_IP_STR_LEN];
-    int port;
-    if (connAddr(link->conn, ip, sizeof(ip), &port, 1) != -1) {
-        serverLog(LL_VERBOSE, "Bound cluster node %.40s (%s) to connection of client %s:%d",
-                  node->name, node->human_nodename, ip, port);
-    } else {
-        serverLog(LL_WARNING, "Error resolving the inbound connection address of node %.40s (%s)",
-                  node->name, node->human_nodename);
+    if (server.verbosity <= LL_VERBOSE) {
+        char ip[NET_IP_STR_LEN];
+        int port;
+        if (connAddrPeerName(link->conn, ip, sizeof(ip), &port) != -1) {
+            serverLog(LL_VERBOSE, "Bound cluster node %.40s (%s) to connection of client %s:%d",
+                      node->name, node->human_nodename, ip, port);
+        } else {
+            serverLog(LL_VERBOSE, "Error resolving the inbound connection address of node %.40s (%s)",
+                      node->name, node->human_nodename);
+        }
     }
 }
 
@@ -3829,18 +3831,20 @@ int clusterProcessPacket(clusterLink *link) {
         clusterSendPing(link, CLUSTERMSG_TYPE_PONG);
     }
 
-    char ip[NET_IP_STR_LEN];
-    int port;
-    if (connAddr(link->conn, ip, sizeof(ip), &port, 1) != -1) {
-        serverLog(LL_DEBUG, "%s packet received from: %.40s (%s) from client: %s:%d",
-                  clusterGetMessageTypeString(type),
-                  link->node ? link->node->name : "NULL",
-                  link->node ? link->node->human_nodename : "",
-                  ip, port);
-    } else {
-        serverLog(LL_WARNING, "Error resolving the address of packet sender %.40s (%s)",
-                  link->node ? link->node->name : "NULL",
-                  link->node ? link->node->human_nodename : "");
+    if (server.verbosity <= LL_DEBUG) {
+        char ip[NET_IP_STR_LEN];
+        int port;
+        if (connAddrPeerName(link->conn, ip, sizeof(ip), &port) != -1) {
+            serverLog(LL_DEBUG, "%s packet received from: %.40s (%s) from client: %s:%d",
+                      clusterGetMessageTypeString(type),
+                      link->node ? link->node->name : "NULL",
+                      link->node ? link->node->human_nodename : "",
+                      ip, port);
+        } else {
+            serverLog(LL_DEBUG, "Error resolving the address of packet sender %.40s (%s)",
+                      link->node ? link->node->name : "NULL",
+                      link->node ? link->node->human_nodename : "");
+        }
     }
     /* PING, PONG, MEET: process config information. */
     if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_PONG || type == CLUSTERMSG_TYPE_MEET) {