Commit 34e20658 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #1193 from tnm/patch-1

Make sure the log standardizes on 'timeout'
parents 123b221d f39a0bdb
...@@ -1554,7 +1554,7 @@ void replicationCron(void) { ...@@ -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);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment