gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '3f4f7aff1aa6abf8cad1726941d4c33b3bfbc9b8' into unstable

Browse Source 
Former-commit-id: 8ebe2fce3da506639acb37fedf1a2d3e47669572
This commit is contained in:
John Sully 2019-07-18 23:18:42 -04:00
commit 79b33481ae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/replication.cpp
View File

@ -2971,7 +2971,7 @@ void replicationCron(void) {
/* First, send PING according to ping_slave_period. */
if ((replication_cron_loops % g_pserver->repl_ping_slave_period) == 0 &&
listLength(g_pserver->slaves))
listLength(g_pserver->slaves) && !clientsArePaused())
{
ping_argv[0] = createStringObject("PING",4);
replicationFeedSlaves(g_pserver->slaves, g_pserver->slaveseldb,