# HG changeset patch # User sugi # Date 1401808706 -32400 # Node ID 5ceb1c4db167fac791b5fe1384085c266b327884 # Parent f6f6e481c00c61d64ef9312ca8400e24c263c40f create setter and getter for TopologyNodeConfig member-variables diff -r f6f6e481c00c -r 5ceb1c4db167 src/main/java/alice/topology/node/StartTopologyNode.java --- a/src/main/java/alice/topology/node/StartTopologyNode.java Tue Jun 03 17:14:17 2014 +0900 +++ b/src/main/java/alice/topology/node/StartTopologyNode.java Wed Jun 04 00:18:26 2014 +0900 @@ -1,11 +1,7 @@ package alice.topology.node; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; import java.net.UnknownHostException; -import java.util.Enumeration; - import alice.codesegment.CodeSegment; import alice.datasegment.DataSegment; import alice.topology.HostMessage; @@ -22,7 +18,7 @@ @Override public void run() { - DataSegment.connect("manager", "", conf.managerHostName, conf.managerPort, false); + DataSegment.connect("manager", "", conf.getManagerHostName(), conf.getManagerPort(), false); String localHostName = null; try { localHostName = InetAddress.getLocalHost().getHostName(); @@ -47,23 +43,5 @@ cs3.configNodeNum.setKey("local", "configNodeNum"); } - - @SuppressWarnings("unused") - private String getIPAddress() throws SocketException { - Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); - - while(interfaces.hasMoreElements()){ - NetworkInterface network = interfaces.nextElement(); - Enumeration addresses = network.getInetAddresses(); - - while(addresses.hasMoreElements()){ - String address = addresses.nextElement().getHostAddress(); - if(!"127.0.0.1".equals(address) && !"0.0.0.0".equals(address)){ - return address; - } - } - } - return "127.0.0.1"; - } - + } diff -r f6f6e481c00c -r 5ceb1c4db167 src/main/java/alice/topology/node/TopologyNodeConfig.java --- a/src/main/java/alice/topology/node/TopologyNodeConfig.java Tue Jun 03 17:14:17 2014 +0900 +++ b/src/main/java/alice/topology/node/TopologyNodeConfig.java Wed Jun 04 00:18:26 2014 +0900 @@ -4,18 +4,34 @@ public class TopologyNodeConfig extends Config { - String managerHostName; - int managerPort; + private String managerHostName; + private int managerPort; public TopologyNodeConfig(String[] args) { super(args); for (int i = 0; i< args.length; i++) { if ("-host".equals(args[i])) { - managerHostName = args[++i]; + setManagerHostName(args[++i]); } else if ("-port".equals(args[i])) { - managerPort = Integer.parseInt(args[++i]); + setManagerPort(Integer.parseInt(args[++i])); } } } + public String getManagerHostName() { + return managerHostName; + } + + public void setManagerHostName(String managerHostName) { + this.managerHostName = managerHostName; + } + + public int getManagerPort() { + return managerPort; + } + + public void setManagerPort(int managerPort) { + this.managerPort = managerPort; + } + }