useless newline removed from log message

This commit is contained in:
antirez 2011-04-07 19:22:24 +02:00
parent d01a6bb3f9
commit 2bc52b2c02

View File

@ -505,6 +505,7 @@ int clusterProcessPacket(clusterLink *link) {
sender = clusterLookupNode(hdr->sender); sender = clusterLookupNode(hdr->sender);
if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_MEET) { if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_MEET) {
int update_config = 0;
redisLog(REDIS_DEBUG,"Ping packet received: %p", link->node); redisLog(REDIS_DEBUG,"Ping packet received: %p", link->node);
/* Add this node if it is new for us and the msg type is MEET. /* Add this node if it is new for us and the msg type is MEET.
@ -518,6 +519,7 @@ int clusterProcessPacket(clusterLink *link) {
nodeIp2String(node->ip,link); nodeIp2String(node->ip,link);
node->port = ntohs(hdr->port); node->port = ntohs(hdr->port);
clusterAddNode(node); clusterAddNode(node);
update_config = 1;
} }
/* Get info from the gossip section */ /* Get info from the gossip section */
@ -525,6 +527,9 @@ int clusterProcessPacket(clusterLink *link) {
/* Anyway reply with a PONG */ /* Anyway reply with a PONG */
clusterSendPing(link,CLUSTERMSG_TYPE_PONG); clusterSendPing(link,CLUSTERMSG_TYPE_PONG);
/* Update config if needed */
if (update_config) clusterSaveConfigOrDie();
} else if (type == CLUSTERMSG_TYPE_PONG) { } else if (type == CLUSTERMSG_TYPE_PONG) {
int update_state = 0; int update_state = 0;
int update_config = 0; int update_config = 0;
@ -879,7 +884,7 @@ void clusterCron(void) {
* normal PING packets. */ * normal PING packets. */
node->flags &= ~REDIS_NODE_MEET; node->flags &= ~REDIS_NODE_MEET;
redisLog(REDIS_NOTICE,"Connecting with Node %.40s at %s:%d\n", node->name, node->ip, node->port+REDIS_CLUSTER_PORT_INCR); redisLog(REDIS_NOTICE,"Connecting with Node %.40s at %s:%d", node->name, node->ip, node->port+REDIS_CLUSTER_PORT_INCR);
} }
} }
dictReleaseIterator(di); dictReleaseIterator(di);