diff options
author | Ted Nyman <ted@ted.io> | 2013-07-12 14:06:27 -0700 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2013-07-12 23:12:27 +0200 |
commit | fe04710908940da676559ee7c6dd363bf0ce6f85 (patch) | |
tree | 36b3687db66291fc5fa7ea6b3fc06865bb065bab | |
parent | 98757b4a6e8c8f98dd0739fc66ad595b2050eed8 (diff) | |
download | redis-fe04710908940da676559ee7c6dd363bf0ce6f85.tar.gz |
Make sure the log standardizes on 'timeout'
-rw-r--r-- | src/replication.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/replication.c b/src/replication.c index 9f79bb229..d44e06ec8 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1534,7 +1534,7 @@ void replicationCron(void) { if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTED && (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); } |