From a79dddadd5038e9d6bbc26d363e39576180c1063 Mon Sep 17 00:00:00 2001 From: Sébastien Lesaint Date: Tue, 23 Aug 2016 15:07:37 +0200 Subject: SONAR-7896 set env var TMPDIR to make JRuby use SQ tmp dir for tmp files these temp file are especially used when uploading --- .../src/main/java/org/sonar/application/App.java | 2 ++ .../src/test/java/org/sonar/application/AppTest.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'sonar-application') diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java index 8c8d73529a8..75cb88a007c 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -92,6 +92,8 @@ public class App implements Stoppable { .addJavaOptions(props.nonNullValue(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS)) // required for logback tomcat valve .setEnvVariable(ProcessProperties.PATH_LOGS, props.nonNullValue(ProcessProperties.PATH_LOGS)) + // ensure JRuby uses SQ's temp directory as temp directory (eg. for temp files used during HTTP uploads) + .setEnvVariable("TMPDIR", props.nonNullValue(ProcessProperties.PATH_TEMP)) .setClassName("org.sonar.server.app.WebServer") .setArguments(props.rawProperties()) .addClasspath("./lib/common/*") diff --git a/sonar-application/src/test/java/org/sonar/application/AppTest.java b/sonar-application/src/test/java/org/sonar/application/AppTest.java index 8150639c865..2d9613a17cd 100644 --- a/sonar-application/src/test/java/org/sonar/application/AppTest.java +++ b/sonar-application/src/test/java/org/sonar/application/AppTest.java @@ -35,6 +35,7 @@ import org.sonar.process.monitor.JavaCommand; import org.sonar.process.monitor.Monitor; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.entry; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -109,6 +110,21 @@ public class AppTest { assertThat(argument.getValue().get(1).getClasspath()).contains("oracle/ojdbc6.jar"); } + @Test + public void sets_TMPDIR_env_var_of_Web_process() throws Exception { + Monitor monitor = mock(Monitor.class); + App app = new App(monitor); + Props props = initDefaultProps(); + String expectedTmpDir = "expected tmp dir"; + props.set("sonar.path.temp", expectedTmpDir); + app.start(props); + + ArgumentCaptor> argument = newJavaCommandArgumentCaptor(); + verify(monitor).start(argument.capture()); + + assertThat(argument.getValue().get(1).getEnvVariables()).contains(entry("TMPDIR", expectedTmpDir)); + } + private Props initDefaultProps() throws IOException { Props props = new Props(new Properties()); ProcessProperties.completeDefaults(props); -- cgit v1.2.3