rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from ptgoetz/cluster-ids

Browse Source 
WIP on configurable cluster names
This commit is contained in:
edwardcapriolo
2016-04-28 19:51:16 -04:00
parent fee57b2ad6 723c0a050b
commit a040e2cd36
13 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/google/code/gossip/manager/PassiveGossipThread.java
View File

@ -53,6 +53,8 @@ abstract public class PassiveGossipThread implements Runnable {
private AtomicBoolean _keepRunning;
private final String _cluster;
public PassiveGossipThread(GossipManager gossipManager) {
_gossipManager = gossipManager;
try {
@ -62,6 +64,7 @@ abstract public class PassiveGossipThread implements Runnable {
GossipService.LOGGER.debug("Gossip service successfully initialized on port "
+ _gossipManager.getMyself().getPort());
GossipService.LOGGER.debug("I am " + _gossipManager.getMyself());
_cluster = _gossipManager.getMyself().getClusterName();
} catch (SocketException ex) {
GossipService.LOGGER.warn(ex);
throw new RuntimeException(ex);
@ -95,8 +98,9 @@ abstract public class PassiveGossipThread implements Runnable {
JSONArray jsonArray = new JSONArray(receivedMessage);
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject memberJSONObject = jsonArray.getJSONObject(i);
if (memberJSONObject.length() == 4) {
if (memberJSONObject.length() == 5 && _cluster.equals(memberJSONObject.get(GossipMember.JSON_CLUSTER))) {
RemoteGossipMember member = new RemoteGossipMember(
memberJSONObject.getString(GossipMember.JSON_CLUSTER),
memberJSONObject.getString(GossipMember.JSON_HOST),
memberJSONObject.getInt(GossipMember.JSON_PORT),
memberJSONObject.getString(GossipMember.JSON_ID),
@ -108,9 +112,11 @@ abstract public class PassiveGossipThread implements Runnable {
senderMember = member;
}
remoteGossipMembers.add(member);
} else if(memberJSONObject.length() == 5) {
GossipService.LOGGER.warn("The member object does not belong to this cluster.");
} else {
GossipService.LOGGER
.error("The received member object does not contain 4 objects:\n"
.error("The received member object does not contain 5 objects:\n"
+ memberJSONObject.toString());
}