SONAR-5408 - Enforce existence of SONAR_HOME for process

2 files changed, 29 insertions, 3 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java
index 8aef7ff81a1..abcdd75dfb0 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Process.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Process.java
@@ -29,6 +29,7 @@ import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
+import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -37,6 +38,8 @@ import java.util.concurrent.TimeUnit;
 
 public abstract class Process implements ProcessMXBean {
 
+  public static final String SONAR_HOME = "SONAR_HOME";
+
   public static final String NAME_PROPERTY = "pName";
   public static final String PORT_PROPERTY = "pPort";
 
@@ -68,6 +71,9 @@ public abstract class Process implements ProcessMXBean {
 
   public Process(Props props) {
 
+  
+    validateSonarHome(props);
+    
     // Loading all Properties from file
     this.props = props;
     this.name = props.of(NAME_PROPERTY, null);
@@ -90,7 +96,7 @@ public abstract class Process implements ProcessMXBean {
       throw new IllegalStateException("Process is not a compliant MBean", e);
     }
 
-    Runtime.getRuntime().addShutdownHook(new Thread(new Runnable(){
+    Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
       @Override
       public void run() {
         Process.this.stop();
@@ -137,4 +143,24 @@ public abstract class Process implements ProcessMXBean {
     this.onStop();
     LOGGER.info("Process[{}]::shutdown END", name);
   }
+
+  private void validateSonarHome(Props props) {
+
+    // check that we have a SONAR_HOME either in props or in env.
+    String sonarHome = props.of(SONAR_HOME, System.getenv(SONAR_HOME));
+    if (StringUtils.isEmpty(sonarHome)) {
+      throw new IllegalStateException("variable SONAR_HOME is not set.");
+    }
+
+    // check that SONAR_HOME exists
+    File home = new File(sonarHome);
+    if(!home.exists()) {
+      throw new IllegalStateException("Directory SONAR_HOME '" + sonarHome + "' is not set");
+    }
+
+    // check that SONAR_HOME is writable
+    if (!home.canWrite()) {
+      throw new IllegalStateException("Directory SONAR_HOME '" + sonarHome + "' is not writable");
+    }
+  }
 }
\ No newline at end of file
diff --git a/server/sonar-search/src/main/resources/logback.xml b/server/sonar-search/src/main/resources/logback.xml
index 0bceb9d9eaf..993420cd06e 100644
--- a/server/sonar-search/src/main/resources/logback.xml
+++ b/server/sonar-search/src/main/resources/logback.xml
@@ -10,9 +10,9 @@
   <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
 
   <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>logs/search.log</File>
+    <File>${SONAR_HOME}/logs/search.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <param name="FileNamePattern" value="${SONAR_HOME}/logs/sonar.%i.log"/>
+      <param name="FileNamePattern" value="${SONAR_HOME}/logs/search.%i.log"/>
       <param name="MinIndex" value="1"/>
       <param name="MaxIndex" value="3"/>
     </rollingPolicy>