Merge pull request #693 from ghurrell/dict-h-typos

[redis.git] / src / replication.c

diff --git a/src/replication.c b/src/replication.c
index b43e9927f5886cc1c77ede523d38a68ba7fda599..c1e4619160bc78c38808df3ed8df222f84d6717c 100644 (file)
--- a/src/replication.c
+++ b/src/replication.c
@@ -3,6 +3,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>

+#include <sys/socket.h>

 #include <sys/stat.h>
 
 /* ---------------------------------- MASTER -------------------------------- */
 #include <sys/stat.h>
 
 /* ---------------------------------- MASTER -------------------------------- */


@@ -720,7 +721,7 @@ void replicationCron(void) {
     if (server.masterhost && server.repl_state == REDIS_REPL_TRANSFER &&
         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {
     if (server.masterhost && server.repl_state == REDIS_REPL_TRANSFER &&
         (time(NULL)-server.repl_transfer_lastio) > server.repl_timeout)
     {

-        redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER...");
+        redisLog(REDIS_WARNING,"Timeout receiving bulk data from MASTER... If the problem persists try to set the 'repl-timeout' parameter in redis.conf to a larger value.");

         replicationAbortSyncTransfer();
     }
 
         replicationAbortSyncTransfer();
     }