diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
commit | 04d448aade12127b1d8c9d4f26963833102698f8 (patch) | |
tree | b4120784e328197aa5d724f6e6ca0d4d3b676c7d /same/src/main/java/com/orbekk/same/App.java | |
parent | a21280cc77c163ec7bd7bc1fc4b451a1fc01a1d8 (diff) |
Change Client.joinNetwork.
Take MasterState instead of a simple URL.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/App.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/App.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/same/src/main/java/com/orbekk/same/App.java b/same/src/main/java/com/orbekk/same/App.java index ca12fa2..2b2985e 100644 --- a/same/src/main/java/com/orbekk/same/App.java +++ b/same/src/main/java/com/orbekk/same/App.java @@ -8,6 +8,13 @@ import com.orbekk.same.config.Configuration; public class App { private Logger logger = LoggerFactory.getLogger(getClass()); + private Services.MasterState getMasterInfo(Configuration configuration) { + return Services.MasterState.newBuilder() + .setMasterUrl(configuration.get(".masterUrl")) + .setMasterLocation(configuration.get("masterLocation")) + .build(); + } + public void run(String[] args) { Configuration configuration = Configuration.loadOrDie(); SameController controller = SameController.create(configuration); @@ -16,7 +23,7 @@ public class App { if ("true".equals(configuration.get("isMaster"))) { controller.createNetwork(configuration.get("networkName")); } else { - controller.joinNetwork(configuration.get("masterUrl")); + controller.joinNetwork(getMasterInfo(configuration)); } controller.join(); } catch (Exception e) { |