aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src/main/java/org
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-08-24 10:21:37 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-08-24 10:21:37 +0200
commit556f0c365d9e644d1bb8f4d37cc89458aa940f61 (patch)
tree761348396c7ac579883acbd0e64a72004e220032 /sonar-application/src/main/java/org
parent9eb83a4ee9e247c4ab8af35b8e30c2f8c220ca68 (diff)
parenta79dddadd5038e9d6bbc26d363e39576180c1063 (diff)
downloadsonarqube-556f0c365d9e644d1bb8f4d37cc89458aa940f61.tar.gz
sonarqube-556f0c365d9e644d1bb8f4d37cc89458aa940f61.zip
Merge branch 'branch-5.6'
Diffstat (limited to 'sonar-application/src/main/java/org')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java2
1 files changed, 2 insertions, 0 deletions
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 8109f0ed0ac..059e81c0feb 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -98,6 +98,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/*")