diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-06 14:11:51 +0100 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-06 14:11:51 +0100 |
commit | 39c5171412ceb6b6719344b4e9db0347062d3b84 (patch) | |
tree | 9a0a8442dd48e8a82a32d9c2a51855cacdf61729 /same/src/main/java/com/orbekk/same/SameController.java | |
parent | bac2fa8e7e6286d64b50cdf6b7fd32f958080ceb (diff) |
Refactor URL handling in Client and Master.
– Take URL as parameter to constructor.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index 2faf669..d898c1d 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -31,9 +31,17 @@ public class SameController { State state = new State("Default"); Broadcaster broadcaster = BroadcasterImpl.getDefaultBroadcastRunner(); - MasterServiceImpl master = new MasterServiceImpl(state, connections, - broadcaster); - ClientServiceImpl client = new ClientServiceImpl(state, connections); + String baseUrl = String.format("http://%s:%s/", + configuration.get("localIp"), configuration.getInt("port")); + + String masterUrl = baseUrl + "MasterService.json"; + String clientUrl = baseUrl + "ClientService.json"; + + MasterServiceImpl master = MasterServiceImpl.create( + connections, broadcaster, masterUrl); + + ClientServiceImpl client = new ClientServiceImpl(state, connections, + clientUrl); PaxosServiceImpl paxos = new PaxosServiceImpl(""); ServerContainer server = new ServerBuilder(port) |