pull/243/head
Nikita 10 years ago
parent 5c1fba0704
commit 0b2e304299

@ -164,7 +164,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
int slot = Integer.valueOf(errorParts[2]); int slot = Integer.valueOf(errorParts[2]);
data.getPromise().setFailure(new RedisMovedException(slot)); data.getPromise().setFailure(new RedisMovedException(slot));
} else { } else {
data.getPromise().setFailure(new RedisException(error)); data.getPromise().setFailure(new RedisException(error + ". channel: " + channel));
} }
} else if (code == ':') { } else if (code == ':') {
String status = in.readBytes(in.bytesBefore((byte) '\r')).toString(CharsetUtil.UTF_8); String status = in.readBytes(in.bytesBefore((byte) '\r')).toString(CharsetUtil.UTF_8);

@ -54,6 +54,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
init(config); init(config);
this.config = create(cfg); this.config = create(cfg);
init(this.config);
for (URI addr : cfg.getNodeAddresses()) { for (URI addr : cfg.getNodeAddresses()) {
RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getTimeout()); RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getTimeout());
@ -78,6 +79,10 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
monitorClusterChange(cfg); monitorClusterChange(cfg);
} }
@Override
protected void initEntry(MasterSlaveServersConfig config) {
}
private void addMasterEntry(ClusterPartition partition, ClusterServersConfig cfg) { private void addMasterEntry(ClusterPartition partition, ClusterServersConfig cfg) {
if (partition.isMasterFail()) { if (partition.isMasterFail()) {
return; return;

Loading…
Cancel
Save