Merge pull request #1401 from huangz1990/fix_sentinel_bug

fix a bug in sentinel.c about pub/sub link
This commit is contained in:
Salvatore Sanfilippo 2013-11-26 06:15:25 -08:00
commit c7136269c6

View File

@ -1607,9 +1607,8 @@ void sentinelReconnectInstance(sentinelRedisInstance *ri) {
}
}
/* Clear the DISCONNECTED flags only if we have both the connections
* (or just the commands connection if this is a slave or a
* sentinel instance). */
if (ri->cc && (ri->flags & (SRI_SLAVE|SRI_SENTINEL) || ri->pc))
* (or just the commands connection if this is a sentinel instance). */
if (ri->cc && (ri->flags & SRI_SENTINEL || ri->pc))
ri->flags &= ~SRI_DISCONNECTED;
}