From c34214fa31575bf1f782573d0a0e4c2164718618 Mon Sep 17 00:00:00 2001 From: adamlavie Date: Wed, 2 Oct 2013 12:48:15 +0200 Subject: [PATCH] CLOUDIFY-2099 changed command according to new form --- .../installer/LocalhostGridAgentBootstrapper.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CLI/src/main/java/org/cloudifysource/shell/installer/LocalhostGridAgentBootstrapper.java b/CLI/src/main/java/org/cloudifysource/shell/installer/LocalhostGridAgentBootstrapper.java index 0ef25533cb..241229f192 100644 --- a/CLI/src/main/java/org/cloudifysource/shell/installer/LocalhostGridAgentBootstrapper.java +++ b/CLI/src/main/java/org/cloudifysource/shell/installer/LocalhostGridAgentBootstrapper.java @@ -121,8 +121,8 @@ public class LocalhostGridAgentBootstrapper { "gsa.gsc", "0", "gsa.global.gsm", "0", "gsa.gsm", "1", "gsa.global.esm", "1" }; // localcloud management agent starts 1 esm, 1 gsm,1 lus - private static final String[] LOCALCLOUD_WIN_MANAGEMENT_ARGUMENTS = new String[] { "start", "startLH", "startGSM", - "startESM", "startGSA", "gsa.global.lus", "0", "gsa.lus", "0", "gsa.gsc", "0", "gsa.global.gsm", "0", + private static final String[] LOCALCLOUD_WIN_MANAGEMENT_ARGUMENTS = new String[] { "start", "\"LH,GSM,GSA,ESM\"", + "gsa.global.lus", "0", "gsa.lus", "0", "gsa.gsc", "0", "gsa.global.gsm", "0", "gsa.gsm_lus", "0", "gsa.global.esm", "0", "gsa.esm", "0" }; // localcloud management agent starts 1 esm, 1 gsm,1 lus private static final String[] LOCALCLOUD_LINUX_MANAGEMENT_ARGUMENTS = new String[] { "start", @@ -133,7 +133,7 @@ public class LocalhostGridAgentBootstrapper { "gsa.global.gsm", "0", "gsa.global.esm", "0" }; // script must spawn a daemon process (that is not a child process) - private static final String[] WINDOWS_LOCALCLOUD_COMMAND = new String[] { "cmd.exe", "/c", "@call", "\"gs.bat\"" }; + private static final String[] WINDOWS_LOCALCLOUD_COMMAND = new String[] { "cmd.exe", "/c", "@call", "gs.bat" }; private static final String[] LINUX_LOCALCLOUD_COMMAND = new String[] { "nohup", "gs.sh" }; // script must spawn a daemon process (that is not a child process) @@ -1121,8 +1121,8 @@ private void waitForManagementServices( logger.fine("OK, LUS, GSM and ESM are up and running."); } catch (final Exception e) { // LUS, GSM or ESM not found - logger.warning("Error! Some management components (LUS/ESM/GSM) are not available after bootstrap " - + "completed. Reported error: " + e.getMessage()); + logger.log(Level.WARNING, "Error! Some management components (LUS/ESM/GSM) are not available after bootstrap " + + "completed. Reported error: " + e.getMessage(), e); throw new CLIValidationException(e, 132, CloudifyErrorMessages.POST_BOOTSTRAP_MISSING_MGMT_COMPONENT.getName()); } @@ -1597,7 +1597,6 @@ private void runCommand(final String[] command, final String[] args, final Strin final String commandString = StringUtils.collectionToDelimitedString(commandLine, " "); final File filename = createScript(commandString); final ProcessBuilder pb = new ProcessBuilder().command(filename.getAbsolutePath()).directory(directory); - String localCloudOptions = "-Xmx" + CloudifyConstants.DEFAULT_LOCALCLOUD_GSA_GSM_ESM_LUS_MEMORY_IN_MB + "m" + " -D" + CloudifyConstants.LUS_PORT_CONTEXT_PROPERTY + "="