diff options
Diffstat (limited to 'same/src/main/java/com/orbekk/same/MasterApp.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/MasterApp.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/same/src/main/java/com/orbekk/same/MasterApp.java b/same/src/main/java/com/orbekk/same/MasterApp.java index 7f79830..c5e270a 100644 --- a/same/src/main/java/com/orbekk/same/MasterApp.java +++ b/same/src/main/java/com/orbekk/same/MasterApp.java @@ -5,14 +5,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.googlecode.jsonrpc4j.JsonRpcServer; +import com.orbekk.same.config.Configuration; public class MasterApp { private Logger logger = LoggerFactory.getLogger(getClass()); - private Server server; - private static final int timeout = 1000; - public void run(int port) { - SameController controller = SameController.create(port); + public void run(Configuration configuration) { + SameController controller = SameController.create(configuration); try { controller.start(); } catch (Exception e) { @@ -22,11 +21,7 @@ public class MasterApp { } public static void main(String[] args) { - if (args.length < 1) { - System.err.println("Usage: port"); - System.exit(1); - } - int port = Integer.parseInt(args[0]); - (new MasterApp()).run(port); + Configuration configuration = Configuration.loadOrDie(); + (new MasterApp()).run(configuration); } } |