Central definition of properties shared by ES, web and monitor processes

3 files changed, 59 insertions, 4 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessConstants.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessConstants.java
new file mode 100644
index 00000000000..57aeb2bd622
--- /dev/null
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessConstants.java
@@ -0,0 +1,57 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.process;
+
+/**
+ * Constants shared by search, web server and monitor processes.
+ * It represents more or less all the properties commented in conf/sonar.properties
+ */
+public interface ProcessConstants {
+
+  String CLUSTER_ACTIVATION = "sonar.cluster.activation";
+  String CLUSTER_MASTER_HOSTS = "sonar.cluster.master";
+  String CLUSTER_NAME = "sonar.cluster.name";
+  String CLUSTER_NODE_NAME = "sonar.node.name";
+
+  String JDBC_URL = "sonar.jdbc.url";
+  String JDBC_LOGIN = "sonar.jdbc.username";
+  String JDBC_PASSWORD = "sonar.jdbc.password";
+  String JDBC_DRIVER_PATH = "sonar.jdbc.driverPath";
+
+  String PATH_DATA = "sonar.path.data";
+  String PATH_HOME = "sonar.path.home";
+  String PATH_LOGS = "sonar.path.logs";
+  String PATH_TEMP = "sonar.path.temp";
+  String PATH_WEB = "sonar.path.web";
+
+  String SEARCH_PORT = "sonar.search.port";
+  String SEARCH_JAVA_OPTS = "sonar.search.javaOpts";
+  String SEARCH_JAVA_ADDITIONAL_OPTS = "sonar.search.javaAdditionalOpts";
+  String SEARCH_TYPE = "sonar.search.type";
+
+  String WEB_JAVA_OPTS = "sonar.web.javaOpts";
+  String WEB_JAVA_ADDITIONAL_OPTS = "sonar.web.javaAdditionalOpts";
+
+  /**
+   * Used by Orchestrator to ask for shutdown of monitor process
+   */
+  String ENABLE_STOP_COMMAND = "sonar.enableStopCommand";
+
+}
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
index 870f1aea067..69327b8115a 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
@@ -70,7 +70,7 @@ public class ProcessEntryPoint implements Stoppable {
     monitored = mp;
 
     try {
-      LoggerFactory.getLogger(getClass()).warn("Starting " + getKey());
+      LoggerFactory.getLogger(getClass()).info("Starting " + getKey());
       Runtime.getRuntime().addShutdownHook(shutdownHook);
       stopWatcher.start();
 
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessLogging.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessLogging.java
index 2fb7baa865e..fe7f647d2e9 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessLogging.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessLogging.java
@@ -30,15 +30,13 @@ import org.slf4j.LoggerFactory;
 
 public class ProcessLogging {
 
-  private static final String PATH_LOGS_PROPERTY = "sonar.path.logs";
-
   public void configure(Props props, String logbackXmlResource) {
     LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
     try {
       JoranConfigurator configurator = new JoranConfigurator();
       configurator.setContext(context);
       context.reset();
-      context.putProperty(PATH_LOGS_PROPERTY, props.nonNullValue(PATH_LOGS_PROPERTY));
+      context.putProperty(ProcessConstants.PATH_LOGS, props.nonNullValue(ProcessConstants.PATH_LOGS));
       doConfigure(configurator, logbackXmlResource);
     } catch (JoranException ignored) {
       // StatusPrinter will handle this