You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/28 11:23:45 UTC
ignite git commit: IGNITE-2304 Improved error message.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 3c9f1458d -> 416d9bd95
IGNITE-2304 Improved error message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/416d9bd9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/416d9bd9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/416d9bd9
Branch: refs/heads/ignite-843-rc2
Commit: 416d9bd95b4dde48eecb3879300efce4b9f41da2
Parents: 3c9f145
Author: Andrey <an...@gridgain.com>
Authored: Mon Dec 28 17:23:37 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Dec 28 17:23:37 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/agent/AgentLauncher.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/416d9bd9/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
index 82a8507..bc1cea7 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
@@ -22,7 +22,9 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
+import com.beust.jcommander.ParameterException;
import org.apache.ignite.agent.handlers.RestExecutor;
import org.apache.log4j.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -50,12 +52,23 @@ public class AgentLauncher {
AgentConfiguration cfg = new AgentConfiguration();
- JCommander jCommander = new JCommander(cfg, args);
+ JCommander jCommander = new JCommander(cfg);
String osName = System.getProperty("os.name").toLowerCase();
jCommander.setProgramName("ignite-web-agent." + (osName.contains("win") ? "bat" : "sh"));
+ try {
+ jCommander.parse(args);
+ }
+ catch (ParameterException pe) {
+ log.error("Failed to parse command line parameters: " + Arrays.toString(args), pe);
+
+ jCommander.usage();
+
+ return;
+ }
+
String prop = cfg.configPath();
AgentConfiguration propCfg = new AgentConfiguration();