summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/SameController.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-17 14:23:25 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-17 14:23:25 +0200
commita6a1c550731caaa2e46aab2112b81f318da229aa (patch)
tree5db60653f65c3b81899a89fd370c892b07bfab32 /same/src/main/java/com/orbekk/same/SameController.java
parent3abdb97eafcf7825d8f2a0bf71b5966a6e3f7c1f (diff)
Client registers with protobuf service location.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r--same/src/main/java/com/orbekk/same/SameController.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 900dcbc..b87e6f5 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -57,6 +57,8 @@ public class SameController {
public static SameController create(Configuration configuration) {
int port = configuration.getInt("port");
int pport = configuration.getInt("pport");
+ String myLocation = configuration.get("localIp") + ":" + pport;
+
ConnectionManagerImpl connections = new ConnectionManagerImpl(
timeout, timeout);
State clientState = new State(".InvalidClientNetwork");
@@ -67,7 +69,8 @@ public class SameController {
MasterServiceProxy master = new MasterServiceProxy();
Client client = new Client(clientState, connections,
- clientUrl, BroadcasterImpl.getDefaultBroadcastRunner());
+ clientUrl, myLocation,
+ BroadcasterImpl.getDefaultBroadcastRunner());
PaxosServiceImpl paxos = new PaxosServiceImpl("");
StateServlet stateServlet = new StateServlet(client.getInterface(),
new VariableFactory(client.getInterface()));