Building a command line with string concatenation

intuit · Jul 24, 2024 · ba393e1 · ba393e1
1 parent 718287f
commit ba393e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ent_standalone/src/main/java/com/intuit/tank/standalone/agent/StandaloneAgentStartup.java b/...ent_standalone/src/main/java/com/intuit/tank/standalone/agent/StandaloneAgentStartup.java
@@ -18,6 +18,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -97,9 +98,8 @@ public void startTest(final StandaloneAgentRequest request) {
                     }
                 }
                 // now start the harness
-                String cmd = API_HARNESS_COMMAND + " -http=" + controllerBase + " -jobId=" + request.getJobId()
-                        + " -stopBehavior=" + request.getStopBehavior();
-                LOG.info("Starting apiharness with command: " + cmd);
+                String[] cmd = {API_HARNESS_COMMAND, " -http=", controllerBase, " -jobId=", request.getJobId(), " -stopBehavior=", request.getStopBehavior()};
+                LOG.info("Starting apiharness with command: {}", Arrays.toString(cmd));
                 currentAvailability.setAvailabilityStatus(AgentAvailabilityStatus.RUNNING_JOB);
                 sendAvailability();
                 Process exec = Runtime.getRuntime().exec(cmd);
@@ -108,7 +108,7 @@ public void startTest(final StandaloneAgentRequest request) {
                 sendAvailability();
                 //
             } catch (Exception e) {
-                LOG.error("Error in AgentStartup " + e, e);
+                LOG.error("Error in AgentStartup {}", e, e);
                 currentAvailability.setAvailabilityStatus(AgentAvailabilityStatus.AVAILABLE);
                 try {
                     sendAvailability();

diff --git a/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java b/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java
@@ -94,7 +94,8 @@ public void run() {
             String jvmArgs = AmazonUtil.getUserDataAsMap().get(TankConstants.KEY_JVM_ARGS);
             logger.info("Starting apiharness with command: "
                     + API_HARNESS_COMMAND + " -http=" + controllerBaseUrl + " " + jvmArgs);
-            Runtime.getRuntime().exec(API_HARNESS_COMMAND + " -http=" + controllerBaseUrl + " " + jvmArgs);
+            Runtime.getRuntime().exec(
+                    new String[] {API_HARNESS_COMMAND, "-http=", controllerBaseUrl, jvmArgs});
         } catch (ConnectException ce) {
             logger.error("Error creating connection to "
                     + controllerBaseUrl + " : this is normal during the bake : " + ce.getMessage());