From 24e2a8818e36d49de62cfa5426373a124d45dc81 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 4 Nov 2015 15:43:03 +0300
Subject: [PATCH] More info about slave up/down in logs

---
 .../org/redisson/connection/MasterSlaveConnectionManager.java | 1 +
 src/main/java/org/redisson/connection/MasterSlaveEntry.java   | 4 +++-
 .../org/redisson/connection/SentinelConnectionManager.java    | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index ab76cf71d..cbcd13ec7 100644
--- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -548,6 +548,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
     protected void slaveDown(ClusterSlotRange slotRange, String host, int port) {
         MasterSlaveEntry entry = getEntry(slotRange);
         slaveDown(entry, host, port);
+        log.info("slave: {}:{} has down", host, port);
     }
 
     protected void changeMaster(ClusterSlotRange slotRange, String host, int port) {
diff --git a/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/src/main/java/org/redisson/connection/MasterSlaveEntry.java
index 4ff8abb9a..5eebde08f 100644
--- a/src/main/java/org/redisson/connection/MasterSlaveEntry.java
+++ b/src/main/java/org/redisson/connection/MasterSlaveEntry.java
@@ -86,6 +86,7 @@ public class MasterSlaveEntry<E extends ConnectionEntry> {
         if (slaveBalancer.getAvailableClients() == 0) {
             InetSocketAddress addr = masterEntry.getClient().getAddr();
             slaveUp(addr.getHostName(), addr.getPort());
+            log.info("master {}:{} used as slave", addr.getHostName(), addr.getPort());
         }
         return conns;
     }
@@ -109,8 +110,9 @@ public class MasterSlaveEntry<E extends ConnectionEntry> {
 
     public void slaveUp(String host, int port) {
         InetSocketAddress addr = masterEntry.getClient().getAddr();
-        if (!addr.getHostName().equals(host) && port != addr.getPort()) {
+        if (!addr.getHostName().equals(host) || port != addr.getPort()) {
             connectionManager.slaveDown(this, addr.getHostName(), addr.getPort());
+            log.info("master {}:{} removed from slaves", addr.getHostName(), addr.getPort());
         }
         slaveBalancer.unfreeze(host, port);
     }
diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index 209bf6397..0ebaee463 100755
--- a/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -235,7 +235,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         String addr = ip + ":" + port;
         if (freezeSlaves.putIfAbsent(addr, true) == null) {
             slaveDown(singleSlotRange, ip, Integer.valueOf(port));
-            log.info("slave: {} has down", addr);
         }
     }