From 4b8987715d5a476d3293a4a3e9d8e3f8d7a32e33 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Fri, 18 Aug 2017 14:38:23 +0200
Subject: [PATCH] SONAR-9590 add working dir to log of launched command

---
 .../process/ProcessLauncherImpl.java          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
index aa5c6117c00..bc19b2a2a69 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
@@ -35,12 +35,12 @@ import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sonar.process.ProcessId;
 import org.sonar.process.command.AbstractCommand;
 import org.sonar.process.command.EsCommand;
 import org.sonar.process.command.JavaCommand;
 import org.sonar.process.sharedmemoryfile.AllProcessesCommands;
 import org.sonar.process.sharedmemoryfile.ProcessCommands;
-import org.sonar.process.ProcessId;
 
 import static java.lang.String.format;
 import static org.sonar.process.ProcessEntryPoint.PROPERTY_PROCESS_INDEX;
@@ -82,9 +82,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
     try {
       writeConfFiles(esCommand);
       ProcessBuilder processBuilder = create(esCommand);
-      if (LOG.isInfoEnabled()) {
-        LOG.info("Launch process[{}]: {}", processId.getKey(), String.join(" ", processBuilder.command()));
-      }
+      logLaunchedCommand(esCommand, processBuilder);
 
       process = processBuilder.start();
 
@@ -123,9 +121,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
       ProcessCommands commands = allProcessesCommands.createAfterClean(processId.getIpcIndex());
 
       ProcessBuilder processBuilder = create(javaCommand);
-      if (LOG.isInfoEnabled()) {
-        LOG.info("Launch process[{}]: {}", processId.getKey(), String.join(" ", processBuilder.command()));
-      }
+      logLaunchedCommand(javaCommand, processBuilder);
       process = processBuilder.start();
       return new ProcessCommandsProcessMonitor(process, processId, commands);
     } catch (Exception e) {
@@ -137,6 +133,15 @@ public class ProcessLauncherImpl implements ProcessLauncher {
     }
   }
 
+  private static <T extends AbstractCommand> void logLaunchedCommand(AbstractCommand<T> command, ProcessBuilder processBuilder) {
+    if (LOG.isInfoEnabled()) {
+      LOG.info("Launch process[{}] from [{}]: {}",
+        command.getProcessId(),
+        command.getWorkDir().getAbsolutePath(),
+        String.join(" ", processBuilder.command()));
+    }
+  }
+
   private ProcessBuilder create(EsCommand esCommand) {
     List<String> commands = new ArrayList<>();
     commands.add(esCommand.getExecutable().getAbsolutePath());
-- 
2.39.5