Merge pull request #1193 from tnm/patch-1

Make sure the log standardizes on 'timeout'
This commit is contained in:
Salvatore Sanfilippo 2013-07-12 14:12:04 -07:00
commit 34e2065830

View File

@ -1554,7 +1554,7 @@ void replicationCron(void) {
if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTED && if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTED &&
(time(NULL)-server.master->lastinteraction) > server.repl_timeout) (time(NULL)-server.master->lastinteraction) > server.repl_timeout)
{ {
redisLog(REDIS_WARNING,"MASTER time out: no data nor PING received..."); redisLog(REDIS_WARNING,"MASTER timeout: no data nor PING received...");
freeClient(server.master); freeClient(server.master);
} }