Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 510139132 -> 2f839acb4
IGNITE-843: Fixed merging cmd options and cfg options. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f839acb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f839acb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f839acb Branch: refs/heads/ignite-843 Commit: 2f839acb4799ca7b2b54b55604dccb77bf924a7f Parents: 5101391 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Aug 19 16:57:07 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Aug 19 16:57:07 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/README.txt | 4 ++-- .../apache/ignite/agent/AgentConfiguration.java | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f839acb/modules/control-center-agent/README.txt ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt index 694fa89..aaabdf0 100644 --- a/modules/control-center-agent/README.txt +++ b/modules/control-center-agent/README.txt @@ -25,7 +25,7 @@ Configuration file: Example configuration file: login=john.sm...@gmail.com - serverURI=wss://control-center.example.com + serverURI=wss://control-center.example.com:3001 Options: -h, --help @@ -49,7 +49,7 @@ Options: User's password. -s, --serverUri - URI for connect to Ignite Web Control Center, for example: "wss://control-center.example.com". + URI for connect to Ignite Web Control Center, for example: "wss://control-center.example.com:3001". Default: "wss://localhost:3001". http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f839acb/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java index cf10e77..318b1ac 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java @@ -27,6 +27,12 @@ import java.util.*; * Agent configuration. */ public class AgentConfiguration { + /** Default server URI. */ + private static final String DFLT_SERVER_URI = "wss://localhost:3001"; + + /** Default Ignite node HTTP URI. */ + private static final String DFLT_NODE_URI = "http://localhost:8080";; + /** */ @Parameter(names = {"-l", "--login"}, description = "User's login (email) on Ignite Web Control Center") private String login; @@ -37,8 +43,8 @@ public class AgentConfiguration { /** */ @Parameter(names = {"-s", "--serverUri"}, description = "URI for connect to Ignite Web Control Center via " + - "web-socket protocol, for example: wss://control-center.my-company.com") - private String srvUri = "wss://localhost:3001"; + "web-socket protocol, for example: wss://control-center.my-company.com:3001") + private String srvUri; /** */ @Parameter(names = {"-n", "--nodeUri"}, description = "URI for connect to Ignite REST server, " + @@ -191,11 +197,14 @@ public class AgentConfiguration { if (cmd.getServerUri() != null) setServerUri(cmd.getServerUri()); + if (srvUri == null) + setServerUri(DFLT_SERVER_URI); + if (cmd.getNodeUri() != null) setNodeUri(cmd.getNodeUri()); - if (cmd.getConfigPath() != null) - setNodeUri(cmd.getNodeUri()); + if (nodeUri == null) + setNodeUri(DFLT_NODE_URI); if (cmd.getDriversFolder() != null) setDriversFolder(cmd.getDriversFolder());
