logging fixed

pull/555/head
Nikita 9 years ago
parent 1744eb0c43
commit 122ac10db3

@ -70,7 +70,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
public ClusterConnectionManager(ClusterServersConfig cfg, Config config) { public ClusterConnectionManager(ClusterServersConfig cfg, Config config) {
super(config); super(config);
connectListener = new ClusterConnectionListener(cfg.getReadMode() == ReadMode.SLAVE); connectListener = new ClusterConnectionListener(cfg.getReadMode() != ReadMode.MASTER);
this.config = create(cfg); this.config = create(cfg);
init(this.config); init(this.config);

@ -217,7 +217,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
final String slaveAddr = ip + ":" + port; final String slaveAddr = ip + ":" + port;
// to avoid addition twice // to avoid addition twice
if (slaves.putIfAbsent(slaveAddr, true) == null && config.getReadMode() == ReadMode.SLAVE) { if (slaves.putIfAbsent(slaveAddr, true) == null && config.getReadMode() != ReadMode.MASTER) {
Future<Void> future = getEntry(singleSlotRange.getStartSlot()).addSlave(ip, Integer.valueOf(port)); Future<Void> future = getEntry(singleSlotRange.getStartSlot()).addSlave(ip, Integer.valueOf(port));
future.addListener(new FutureListener<Void>() { future.addListener(new FutureListener<Void>() {
@Override @Override
@ -278,11 +278,14 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
} }
private void slaveDown(String ip, String port) { private void slaveDown(String ip, String port) {
if (config.getReadMode() == ReadMode.SLAVE) { if (config.getReadMode() == ReadMode.MASTER) {
getEntry(singleSlotRange.getStartSlot()).slaveDown(ip, Integer.valueOf(port), FreezeReason.MANAGER); log.warn("slave: {}:{} has down", ip, port);
} else {
MasterSlaveEntry entry = getEntry(singleSlotRange.getStartSlot());
if (entry.slaveDown(ip, Integer.valueOf(port), FreezeReason.MANAGER)) {
log.warn("slave: {}:{} has down", ip, port);
}
} }
log.warn("slave: {}:{} has down", ip, port);
} }
private void onNodeUp(URI addr, String msg) { private void onNodeUp(URI addr, String msg) {

Loading…
Cancel
Save