diff options
| author | Daniel Schwarz <daniel.schwarz@sonarsource.com> | 2017-08-17 16:44:34 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-05 14:24:13 +0200 |
| commit | cac5ac482c98ce8a555b1b6b646b0f547532fb0c (patch) | |
| tree | 6b37d02106027eea5e9fd19e27ef142d965449bd /server/sonar-main | |
| parent | d63783420e7d1789f3dfe15ae1100ad2f4e7a510 (diff) | |
| download | sonarqube-cac5ac482c98ce8a555b1b6b646b0f547532fb0c.tar.gz sonarqube-cac5ac482c98ce8a555b1b6b646b0f547532fb0c.zip | |
SONAR-9714 Pass Elasticsearch settings in a yaml file
instead of command line arguments
Diffstat (limited to 'server/sonar-main')
| -rw-r--r-- | server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java index 76576b6d235..3c2816474a7 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java +++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.function.Supplier; -import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.process.ProcessId; @@ -90,7 +89,7 @@ public class ProcessLauncherImpl implements ProcessLauncher { } } - private void writeConfFiles(EsCommand esCommand) { + private static void writeConfFiles(EsCommand esCommand) { EsFileSystem esFileSystem = esCommand.getFileSystem(); File confDir = esFileSystem.getConfDirectory(); if (!confDir.exists() && !confDir.mkdirs()) { @@ -100,7 +99,7 @@ public class ProcessLauncherImpl implements ProcessLauncher { } try { - IOUtils.copy(getClass().getResourceAsStream("elasticsearch.yml"), new FileOutputStream(esFileSystem.getElasticsearchYml())); + esCommand.getEsYmlSettings().writeToYmlSettingsFile(esFileSystem.getElasticsearchYml()); esCommand.getEsJvmOptions().writeToJvmOptionFile(esFileSystem.getJvmOptions()); esCommand.getLog4j2Properties().store(new FileOutputStream(esFileSystem.getLog4j2Properties()), "log4j2 properties file for ES bundled in SonarQube"); } catch (IOException e) { |