Use new slave name function for diskless repl reporting.

This commit is contained in:
antirez 2014-10-27 12:23:03 +01:00
parent 8a416ca46e
commit 775cc30a98

View File

@ -1347,15 +1347,15 @@ void backgroundSaveDoneHandlerSocket(int exitcode, int bysignal) {
} }
if (j == ok_slaves[0] || errorcode != 0) { if (j == ok_slaves[0] || errorcode != 0) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"Closing slave %llu: child->slave RDB transfer failed: %s", "Closing slave %s: child->slave RDB transfer failed: %s",
slave->id, replicationGetSlaveName(slave),
(errorcode == 0) ? "RDB transfer child aborted" (errorcode == 0) ? "RDB transfer child aborted"
: strerror(errorcode)); : strerror(errorcode));
freeClient(slave); freeClient(slave);
} else { } else {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"Slave %llu correctly received the streamed RDB file.", "Slave %s correctly received the streamed RDB file.",
slave->id); replicationGetSlaveName(slave));
/* Restore the socket as non-blocking. */ /* Restore the socket as non-blocking. */
anetNonBlock(NULL,slave->fd); anetNonBlock(NULL,slave->fd);
anetSendTimeout(NULL,slave->fd,0); anetSendTimeout(NULL,slave->fd,0);