public RollingPolicy createRollingPolicy(Context ctx, Props props, String filenamePrefix) {
String rollingPolicy = props.value(ROLLING_POLICY_PROPERTY, "time:yyyy-MM-dd");
int maxFiles = props.valueAsInt(MAX_FILES_PROPERTY, 7);
- File logsDir = props.nonNullValueAsFile(ProcessConstants.PATH_LOGS);
+ File logsDir = props.nonNullValueAsFile(ProcessProperties.PATH_LOGS);
if (rollingPolicy.startsWith("time:")) {
return new TimeRollingPolicy(ctx, filenamePrefix, logsDir, maxFiles, StringUtils.substringAfter(rollingPolicy, "time:"));
+++ /dev/null
-/*
- * 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_ACTIVATE = "sonar.cluster.activate";
- String CLUSTER_MASTER = "sonar.cluster.master";
- String CLUSTER_MASTER_HOST = "sonar.cluster.masterHost";
- 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 JDBC_MAX_ACTIVE = "sonar.jdbc.maxActive";
- String JDBC_MAX_IDLE = "sonar.jdbc.maxIdle";
- String JDBC_MIN_IDLE = "sonar.jdbc.minIdle";
- String JDBC_MAX_WAIT = "sonar.jdbc.maxWait";
- String JDBC_MIN_EVICTABLE_IDLE_TIME_MILLIS = "sonar.jdbc.minEvictableIdleTimeMillis";
- String JDBC_TIME_BETWEEN_EVICTION_RUNS_MILLIS = "sonar.jdbc.timeBetweenEvictionRunsMillis";
-
- 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_HOST = "sonar.search.host";
- 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";
-
- // Constants declared by the ES plugin ListUpdate (see sonar-search)
- // that are used by sonar-server
- String ES_PLUGIN_LISTUPDATE_SCRIPT_NAME = "listUpdate";
- String ES_PLUGIN_LISTUPDATE_ID_FIELD = "idField";
- String ES_PLUGIN_LISTUPDATE_ID_VALUE = "idValue";
- String ES_PLUGIN_LISTUPDATE_FIELD = "field";
- String ES_PLUGIN_LISTUPDATE_VALUE = "value";
-}
--- /dev/null
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Constants shared by search, web server and app processes.
+ * They are almost all the properties defined in conf/sonar.properties.
+ */
+public class ProcessProperties {
+
+ public static final String CLUSTER_ACTIVATE = "sonar.cluster.activate";
+ public static final String CLUSTER_MASTER = "sonar.cluster.master";
+ public static final String CLUSTER_MASTER_HOST = "sonar.cluster.masterHost";
+ public static final String CLUSTER_NAME = "sonar.cluster.name";
+ public static final String CLUSTER_NODE_NAME = "sonar.node.name";
+
+ public static final String JDBC_URL = "sonar.jdbc.url";
+ public static final String JDBC_LOGIN = "sonar.jdbc.username";
+ public static final String JDBC_PASSWORD = "sonar.jdbc.password";
+ public static final String JDBC_DRIVER_PATH = "sonar.jdbc.driverPath";
+ public static final String JDBC_MAX_ACTIVE = "sonar.jdbc.maxActive";
+ public static final String JDBC_MAX_IDLE = "sonar.jdbc.maxIdle";
+ public static final String JDBC_MIN_IDLE = "sonar.jdbc.minIdle";
+ public static final String JDBC_MAX_WAIT = "sonar.jdbc.maxWait";
+ public static final String JDBC_MIN_EVICTABLE_IDLE_TIME_MILLIS = "sonar.jdbc.minEvictableIdleTimeMillis";
+ public static final String JDBC_TIME_BETWEEN_EVICTION_RUNS_MILLIS = "sonar.jdbc.timeBetweenEvictionRunsMillis";
+
+ public static final String PATH_DATA = "sonar.path.data";
+ public static final String PATH_HOME = "sonar.path.home";
+ public static final String PATH_LOGS = "sonar.path.logs";
+ public static final String PATH_TEMP = "sonar.path.temp";
+ public static final String PATH_WEB = "sonar.path.web";
+
+ public static final String SEARCH_HOST = "sonar.search.host";
+ public static final String SEARCH_PORT = "sonar.search.port";
+ public static final String SEARCH_HTTP_PORT = "sonar.search.httpPort";
+ public static final String SEARCH_JAVA_OPTS = "sonar.search.javaOpts";
+ public static final String SEARCH_JAVA_ADDITIONAL_OPTS = "sonar.search.javaAdditionalOpts";
+
+ public static final String WEB_JAVA_OPTS = "sonar.web.javaOpts";
+ public static final String WEB_JAVA_ADDITIONAL_OPTS = "sonar.web.javaAdditionalOpts";
+
+ /**
+ * Used by Orchestrator to ask for shutdown of monitor process
+ */
+ public static final String ENABLE_STOP_COMMAND = "sonar.enableStopCommand";
+
+ // Constants declared by the ES plugin ListUpdate (see sonar-search)
+ // that are used by sonar-server
+ public static final String ES_PLUGIN_LISTUPDATE_SCRIPT_NAME = "listUpdate";
+ public static final String ES_PLUGIN_LISTUPDATE_ID_FIELD = "idField";
+ public static final String ES_PLUGIN_LISTUPDATE_ID_VALUE = "idValue";
+ public static final String ES_PLUGIN_LISTUPDATE_FIELD = "field";
+ public static final String ES_PLUGIN_LISTUPDATE_VALUE = "value";
+
+ public static final String WEB_ENFORCED_JVM_ARGS = "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false " +
+ // jruby is slow with java 8: https://jira.codehaus.org/browse/SONAR-6115
+ "-Djruby.compile.invokedynamic=false";
+
+ private ProcessProperties() {
+ // only static stuff
+ }
+
+ public static void completeDefaults(Props props) {
+ // init string properties
+ for (Map.Entry<String, String> entry : defaults().entrySet()) {
+ props.setDefault(entry.getKey(), entry.getValue());
+ }
+
+ // init ports
+ for (Map.Entry<String, Integer> entry : defaultPorts().entrySet()) {
+ String key = entry.getKey();
+ int port = props.valueAsInt(key, -1);
+ if (port == -1) {
+ // default port
+ props.set(key, String.valueOf((int) entry.getValue()));
+ } else if (port == 0) {
+ // pick one available port
+ props.set(key, String.valueOf(NetworkUtils.freePort()));
+ }
+ }
+ }
+
+ public static Map<String, String> defaults() {
+ Map<String, String> defaults = new HashMap<>();
+ defaults.put(ProcessProperties.CLUSTER_NAME, "sonarqube");
+ defaults.put(ProcessProperties.CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis());
+
+ defaults.put(ProcessProperties.SEARCH_HOST, "127.0.0.1");
+ defaults.put(ProcessProperties.SEARCH_JAVA_OPTS, "-Xmx1G -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
+ "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " +
+ "-XX:+HeapDumpOnOutOfMemoryError");
+ defaults.put(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS, "");
+
+ defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
+ defaults.put(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS, "");
+ defaults.put(ProcessProperties.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar");
+ defaults.put(ProcessProperties.JDBC_LOGIN, "sonar");
+ defaults.put(ProcessProperties.JDBC_PASSWORD, "sonar");
+ defaults.put(ProcessProperties.JDBC_MAX_ACTIVE, "50");
+ defaults.put(ProcessProperties.JDBC_MAX_IDLE, "5");
+ defaults.put(ProcessProperties.JDBC_MIN_IDLE, "2");
+ defaults.put(ProcessProperties.JDBC_MAX_WAIT, "5000");
+ defaults.put(ProcessProperties.JDBC_MIN_EVICTABLE_IDLE_TIME_MILLIS, "600000");
+ defaults.put(ProcessProperties.JDBC_TIME_BETWEEN_EVICTION_RUNS_MILLIS, "30000");
+ return defaults;
+ }
+
+ private static Map<String, Integer> defaultPorts() {
+ Map<String, Integer> defaults = new HashMap<>();
+ defaults.put(ProcessProperties.SEARCH_PORT, 9001);
+ return defaults;
+ }
+}
@Before
public void setUp() throws Exception {
File dir = temp.newFolder();
- props.set(ProcessConstants.PATH_LOGS, dir.getAbsolutePath());
+ props.set(ProcessProperties.PATH_LOGS, dir.getAbsolutePath());
}
@AfterClass
--- /dev/null
+/*
+ * 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;
+
+import org.junit.Test;
+import org.sonar.test.TestUtils;
+
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ProcessPropertiesTest {
+
+ @Test
+ public void init_defaults() throws Exception {
+ Props props = new Props(new Properties());
+ ProcessProperties.completeDefaults(props);
+
+ assertThat(props.value("sonar.search.javaOpts")).contains("-Xmx");
+ assertThat(props.value("sonar.jdbc.username")).isEqualTo("sonar");
+ assertThat(props.valueAsInt("sonar.jdbc.maxActive")).isEqualTo(50);
+ }
+
+ @Test
+ public void do_not_override_existing_properties() throws Exception {
+ Properties p = new Properties();
+ p.setProperty("sonar.jdbc.username", "angela");
+ Props props = new Props(p);
+ ProcessProperties.completeDefaults(props);
+
+ assertThat(props.value("sonar.jdbc.username")).isEqualTo("angela");
+ }
+
+ @Test
+ public void use_random_port_if_zero() throws Exception {
+ Properties p = new Properties();
+ p.setProperty("sonar.search.port", "0");
+ Props props = new Props(p);
+
+ ProcessProperties.completeDefaults(props);
+ assertThat(props.valueAsInt("sonar.search.port")).isGreaterThan(0);
+ }
+
+ @Test
+ public void private_constructor() throws Exception {
+ assertThat(TestUtils.hasOnlyPrivateConstructors(ProcessProperties.class)).isTrue();
+ }
+}
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.node.internal.InternalNode;
-import org.slf4j.LoggerFactory;
import org.sonar.process.MinimumViableSystem;
import org.sonar.process.Monitored;
import org.sonar.process.ProcessEntryPoint;
@Override
public void start() {
- LoggerFactory.getLogger(SearchServer.class).info("Starting Elasticsearch[{}] on port {}", settings.clusterName(), settings.tcpPort());
-
node = new InternalNode(settings.build(), false);
node.start();
}
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.process.MessageException;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import org.sonar.search.script.ListUpdate;
private static final Logger LOGGER = LoggerFactory.getLogger(SearchSettings.class);
- public static final String PROP_HTTP_PORT = "sonar.search.httpPort";
public static final String PROP_MARVEL_HOSTS = "sonar.search.marvelHosts";
private final Props props;
- private final Set<String> masterHosts = new LinkedHashSet<String>();
- private final String clusterName;
- private final String hostName;
- private final int tcpPort;
+ private final Set<String> masterHosts = new LinkedHashSet<>();
SearchSettings(Props props) {
this.props = props;
- masterHosts.addAll(Arrays.asList(StringUtils.split(props.value(ProcessConstants.CLUSTER_MASTER_HOST, ""), ",")));
- clusterName = props.value(ProcessConstants.CLUSTER_NAME);
- hostName = props.value(ProcessConstants.SEARCH_HOST);
- Integer port = props.valueAsInt(ProcessConstants.SEARCH_PORT);
- if (port == null) {
- throw new MessageException("Property is not set: " + ProcessConstants.SEARCH_PORT);
- }
- tcpPort = port.intValue();
+ masterHosts.addAll(Arrays.asList(StringUtils.split(props.value(ProcessProperties.CLUSTER_MASTER_HOST, ""), ",")));
}
boolean inCluster() {
- return props.valueAsBoolean(ProcessConstants.CLUSTER_ACTIVATE, false);
+ return props.valueAsBoolean(ProcessProperties.CLUSTER_ACTIVATE, false);
}
boolean isMaster() {
- return props.valueAsBoolean(ProcessConstants.CLUSTER_MASTER, false);
- }
-
- String clusterName() {
- return clusterName;
- }
-
- int tcpPort() {
- return tcpPort;
- }
-
- String hostName() {
- return hostName;
+ return props.valueAsBoolean(ProcessProperties.CLUSTER_MASTER, false);
}
Settings build() {
}
private void configureFileSystem(ImmutableSettings.Builder builder) {
- File homeDir = props.nonNullValueAsFile(ProcessConstants.PATH_HOME);
+ File homeDir = props.nonNullValueAsFile(ProcessProperties.PATH_HOME);
File dataDir, workDir, logDir;
// data dir
- String dataPath = props.value(ProcessConstants.PATH_DATA);
+ String dataPath = props.value(ProcessProperties.PATH_DATA);
if (StringUtils.isNotEmpty(dataPath)) {
dataDir = new File(dataPath, "es");
} else {
builder.put("path.data", dataDir.getAbsolutePath());
// working dir
- String workPath = props.value(ProcessConstants.PATH_TEMP);
+ String workPath = props.value(ProcessProperties.PATH_TEMP);
if (StringUtils.isNotEmpty(workPath)) {
workDir = new File(workPath);
} else {
builder.put("path.plugins", workDir.getAbsolutePath());
// log dir
- String logPath = props.value(ProcessConstants.PATH_LOGS);
+ String logPath = props.value(ProcessProperties.PATH_LOGS);
if (StringUtils.isNotEmpty(logPath)) {
logDir = new File(logPath);
} else {
private void configurePlugins(ImmutableSettings.Builder builder) {
builder
.put("script.default_lang", "native")
- .put(String.format("script.native.%s.type", ProcessConstants.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME),
+ .put(String.format("script.native.%s.type", ProcessProperties.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME),
ListUpdate.UpdateListScriptFactory.class.getName());
}
private void configureNetwork(ImmutableSettings.Builder builder) {
+ String host = props.value(ProcessProperties.SEARCH_HOST);
+ Integer port = props.valueAsInt(ProcessProperties.SEARCH_PORT);
+ LOGGER.info("Elasticsearch listening on {}:{}", host, port);
+
// disable multicast
builder.put("discovery.zen.ping.multicast.enabled", "false");
- builder.put("transport.tcp.port", tcpPort);
- if (hostName != null) {
- builder.put("transport.host", hostName);
- }
+ builder.put("transport.tcp.port", port);
+ builder.put("transport.host", host);
+
// Elasticsearch sets the default value of TCP reuse address to true only on non-MSWindows machines, but why ?
builder.put("network.tcp.reuse_address", true);
- Integer httpPort = props.valueAsInt(PROP_HTTP_PORT);
- if (httpPort == null) {
+ Integer httpPort = props.valueAsInt(ProcessProperties.SEARCH_HTTP_PORT);
+ if (httpPort == null || httpPort < 0) {
// standard configuration
builder.put("http.enabled", false);
} else {
// see https://github.com/lmenezes/elasticsearch-kopf/issues/195
builder.put("http.cors.enabled", true);
builder.put("http.enabled", true);
- if (hostName != null) {
- builder.put("http.host", hostName);
- } else {
- builder.put("http.host", "127.0.0.1");
- }
+ builder.put("http.host", host);
builder.put("http.port", httpPort);
}
}
builder.put("discovery.zen.minimum_master_nodes", 1);
} else {
throw new MessageException(String.format("Not an Elasticsearch master nor slave. Please check properties %s and %s",
- ProcessConstants.CLUSTER_MASTER, ProcessConstants.CLUSTER_MASTER_HOST));
+ ProcessProperties.CLUSTER_MASTER, ProcessProperties.CLUSTER_MASTER_HOST));
}
}
builder.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, replicationFactor);
- builder.put("cluster.name", clusterName);
+ builder.put("cluster.name", props.value(ProcessProperties.CLUSTER_NAME));
builder.put("cluster.routing.allocation.awareness.attributes", "rack_id");
- builder.put("node.rack_id", props.value(ProcessConstants.CLUSTER_NODE_NAME, "unknown"));
- builder.put("node.name", props.value(ProcessConstants.CLUSTER_NODE_NAME));
+ builder.put("node.rack_id", props.value(ProcessProperties.CLUSTER_NODE_NAME, "unknown"));
+ builder.put("node.name", props.value(ProcessProperties.CLUSTER_NODE_NAME));
}
private void configureMarvel(ImmutableSettings.Builder builder) {
- Set<String> marvels = new TreeSet<String>();
+ Set<String> marvels = new TreeSet<>();
marvels.addAll(Arrays.asList(StringUtils.split(props.value(PROP_MARVEL_HOSTS, ""), ",")));
// If we're collecting indexing data send them to the Marvel host(s)
import org.elasticsearch.script.AbstractExecutableScript;
import org.elasticsearch.script.ExecutableScript;
import org.elasticsearch.script.NativeScriptFactory;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.util.ArrayList;
import java.util.Collection;
public static class UpdateListScriptFactory implements NativeScriptFactory {
@Override
public ExecutableScript newScript(@Nullable Map<String, Object> params) {
- String idField = XContentMapValues.nodeStringValue(params.get(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD), null);
- String idValue = XContentMapValues.nodeStringValue(params.get(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE), null);
- String field = XContentMapValues.nodeStringValue(params.get(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD), null);
+ String idField = XContentMapValues.nodeStringValue(params.get(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD), null);
+ String idValue = XContentMapValues.nodeStringValue(params.get(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE), null);
+ String field = XContentMapValues.nodeStringValue(params.get(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD), null);
Map value = null;
if (idField == null) {
- throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD));
+ throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD));
}
if (idValue == null) {
- throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE));
+ throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE));
}
if (field == null) {
- throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD));
+ throw new IllegalStateException(String.format("Missing '%s' parameter", ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD));
}
//NULL case is deletion of nested item
- if (params.containsKey(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE)) {
- Object obj = params.get(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE);
+ if (params.containsKey(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE)) {
+ Object obj = params.get(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE);
if (obj != null) {
- value = XContentMapValues.nodeMapValue(params.get(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE), "Update item");
+ value = XContentMapValues.nodeMapValue(params.get(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE), "Update item");
}
}
import org.junit.rules.TestRule;
import org.junit.rules.Timeout;
import org.sonar.process.NetworkUtils;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
+import java.net.InetAddress;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat;
@Test
public void start_stop_server() throws Exception {
Props props = new Props(new Properties());
- props.set(ProcessConstants.SEARCH_PORT, String.valueOf(port));
- props.set(ProcessConstants.CLUSTER_NAME, CLUSTER_NAME);
- props.set(ProcessConstants.CLUSTER_NODE_NAME, "test");
- props.set(ProcessConstants.PATH_HOME, temp.newFolder().getAbsolutePath());
+ // the following properties have always default values (see ProcessProperties)
+ String host = InetAddress.getLocalHost().getHostAddress();
+ props.set(ProcessProperties.SEARCH_HOST, host);
+ props.set(ProcessProperties.SEARCH_PORT, String.valueOf(port));
+ props.set(ProcessProperties.CLUSTER_NAME, CLUSTER_NAME);
+ props.set(ProcessProperties.CLUSTER_NODE_NAME, "test");
+ props.set(ProcessProperties.PATH_HOME, temp.newFolder().getAbsolutePath());
searchServer = new SearchServer(props);
searchServer.start();
assertThat(searchServer.isReady()).isTrue();
- client = getSearchClient();
+ Settings settings = ImmutableSettings.settingsBuilder().put("cluster.name", CLUSTER_NAME).build();
+ client = new TransportClient(settings)
+ .addTransportAddress(new InetSocketTransportAddress(host, port));
+ assertThat(client.admin().cluster().prepareClusterStats().get().getStatus()).isEqualTo(ClusterHealthStatus.GREEN);
searchServer.stop();
searchServer.awaitStop();
// ok
}
}
-
- private Client getSearchClient() {
- Settings settings = ImmutableSettings.settingsBuilder()
- .put("cluster.name", CLUSTER_NAME).build();
- Client client = new TransportClient(settings)
- .addTransportAddress(new InetSocketTransportAddress("localhost", port));
- assertThat(client.admin().cluster().prepareClusterStats().get().getStatus()).isEqualTo(ClusterHealthStatus.GREEN);
- return client;
- }
}
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.sonar.process.MessageException;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
@Rule
public TemporaryFolder temp = new TemporaryFolder();
- @Test
- public void fail_if_tcp_port_is_not_set() throws Exception {
- try {
- new SearchSettings(new Props(new Properties()));
- fail();
- } catch (MessageException e) {
- assertThat(e).hasMessage("Property is not set: sonar.search.port");
- }
- }
-
@Test
public void test_default_settings() throws Exception {
File homeDir = temp.newFolder();
Props props = new Props(new Properties());
- props.set(ProcessConstants.SEARCH_PORT, "1234");
- props.set(ProcessConstants.SEARCH_HOST, "127.0.0.1");
- props.set(ProcessConstants.PATH_HOME, homeDir.getAbsolutePath());
- props.set(ProcessConstants.CLUSTER_NAME, "tests");
- props.set(ProcessConstants.CLUSTER_NODE_NAME, "test");
+ props.set(ProcessProperties.SEARCH_PORT, "1234");
+ props.set(ProcessProperties.SEARCH_HOST, "127.0.0.1");
+ props.set(ProcessProperties.PATH_HOME, homeDir.getAbsolutePath());
+ props.set(ProcessProperties.CLUSTER_NAME, "tests");
+ props.set(ProcessProperties.CLUSTER_NODE_NAME, "test");
SearchSettings searchSettings = new SearchSettings(props);
assertThat(searchSettings.inCluster()).isFalse();
- assertThat(searchSettings.clusterName()).isEqualTo("tests");
- assertThat(searchSettings.tcpPort()).isEqualTo(1234);
- assertThat(searchSettings.hostName()).isEqualTo("127.0.0.1");
Settings generated = searchSettings.build();
assertThat(generated.get("transport.tcp.port")).isEqualTo("1234");
SearchSettings searchSettings = new SearchSettings(props);
assertThat(searchSettings.inCluster()).isFalse();
- assertThat(searchSettings.clusterName()).isEqualTo("tests");
- assertThat(searchSettings.tcpPort()).isEqualTo(1234);
- assertThat(searchSettings.hostName()).isEqualTo(null);
Settings generated = searchSettings.build();
- assertThat(generated.get("transport.tcp.port")).isEqualTo("1234");
- assertThat(generated.get("transport.host")).isEqualTo(null);
- assertThat(generated.get("cluster.name")).isEqualTo("tests");
- assertThat(generated.get("node.name")).isEqualTo("test");
+ assertThat(generated.get("transport.tcp.port")).isEqualTo("9001");
+ assertThat(generated.get("transport.host")).isEqualTo("127.0.0.1");
+ assertThat(generated.get("cluster.name")).isEqualTo("sonarqube");
+ assertThat(generated.get("node.name")).startsWith("sonar-");
}
@Test
public void override_dirs() throws Exception {
File dataDir = temp.newFolder(), logDir = temp.newFolder(), tempDir = temp.newFolder();
Props props = minProps();
- props.set(ProcessConstants.PATH_DATA, dataDir.getAbsolutePath());
- props.set(ProcessConstants.PATH_LOGS, logDir.getAbsolutePath());
- props.set(ProcessConstants.PATH_TEMP, tempDir.getAbsolutePath());
+ props.set(ProcessProperties.PATH_DATA, dataDir.getAbsolutePath());
+ props.set(ProcessProperties.PATH_LOGS, logDir.getAbsolutePath());
+ props.set(ProcessProperties.PATH_TEMP, tempDir.getAbsolutePath());
Settings settings = new SearchSettings(props).build();
@Test
public void test_cluster_master() throws Exception {
Props props = minProps();
- props.set(ProcessConstants.CLUSTER_ACTIVATE, "true");
- props.set(ProcessConstants.CLUSTER_MASTER, "true");
+ props.set(ProcessProperties.CLUSTER_ACTIVATE, "true");
+ props.set(ProcessProperties.CLUSTER_MASTER, "true");
Settings settings = new SearchSettings(props).build();
assertThat(settings.get("index.number_of_replicas")).isEqualTo("1");
@Test
public void test_cluster_slave() throws Exception {
Props props = minProps();
- props.set(ProcessConstants.CLUSTER_ACTIVATE, "true");
- props.set(ProcessConstants.CLUSTER_MASTER_HOST, "127.0.0.2,127.0.0.3");
+ props.set(ProcessProperties.CLUSTER_ACTIVATE, "true");
+ props.set(ProcessProperties.CLUSTER_MASTER_HOST, "127.0.0.2,127.0.0.3");
Settings settings = new SearchSettings(props).build();
assertThat(settings.get("discovery.zen.ping.unicast.hosts")).isEqualTo("127.0.0.2,127.0.0.3");
@Test
public void bad_cluster_configuration() throws Exception {
Props props = minProps();
- props.set(ProcessConstants.CLUSTER_ACTIVATE, "true");
+ props.set(ProcessProperties.CLUSTER_ACTIVATE, "true");
try {
new SearchSettings(props).build();
fail();
- } catch (MessageException e) {
+ } catch (MessageException ignored) {
+ // expected
}
}
@Test
public void enable_http_connector() throws Exception {
Props props = minProps();
- props.set(SearchSettings.PROP_HTTP_PORT, "9010");
+ props.set(ProcessProperties.SEARCH_HTTP_PORT, "9010");
Settings settings = new SearchSettings(props).build();
assertThat(settings.get("http.port")).isEqualTo("9010");
@Test
public void enable_http_connector_different_host() throws Exception {
Props props = minProps();
- props.set(SearchSettings.PROP_HTTP_PORT, "9010");
- props.set(ProcessConstants.SEARCH_HOST, "127.0.0.2");
+ props.set(ProcessProperties.SEARCH_HTTP_PORT, "9010");
+ props.set(ProcessProperties.SEARCH_HOST, "127.0.0.2");
Settings settings = new SearchSettings(props).build();
assertThat(settings.get("http.port")).isEqualTo("9010");
private Props minProps() throws IOException {
File homeDir = temp.newFolder();
Props props = new Props(new Properties());
- props.set(ProcessConstants.SEARCH_PORT, "1234");
- props.set(ProcessConstants.PATH_HOME, homeDir.getAbsolutePath());
- props.set(ProcessConstants.CLUSTER_NAME, "tests");
- props.set(ProcessConstants.CLUSTER_NODE_NAME, "test");
+ ProcessProperties.completeDefaults(props);
+ props.set(ProcessProperties.PATH_HOME, homeDir.getAbsolutePath());
return props;
}
}
import org.elasticsearch.script.ExecutableScript;
import org.junit.Before;
import org.junit.Test;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.util.Collection;
import java.util.HashMap;
}
// Missing ID_VALUE
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "test");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "test");
try {
factory.newScript(params);
fail();
}
// Missing FIELD
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "test");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "test");
try {
factory.newScript(params);
fail();
}
// Has all required attributes and Null Value
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, "test");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, "test");
ExecutableScript script = factory.newScript(params);
assertThat(script).isNotNull();
// Has all required attributes and VALUE of wrong type
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, new Integer(52));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, new Integer(52));
try {
factory.newScript(params);
fail();
}
// Has all required attributes and Proper VALUE
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, ImmutableMap.of("key", "value"));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, ImmutableMap.of("key", "value"));
script = factory.newScript(params);
assertThat(script).isNotNull();
// Missing ID_FIELD
- params.remove(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD);
+ params.remove(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD);
try {
factory.newScript(params);
fail();
// 0 Create list when field does not exists
Map<String, Object> params = new HashMap<String, Object>();
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, listField);
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "1", "value", "A"));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "1", "value", "A"));
ExecutableScript script = factory.newScript(params);
script.setNextVar("ctx", ImmutableMap.of("_source", source));
// Add item to existing list
params = new HashMap<String, Object>();
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, listField);
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "2", "value", "B"));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "2", "value", "B"));
script = factory.newScript(params);
script.setNextVar("ctx", ImmutableMap.of("_source", source));
script.run();
// updated first item in list
params = new HashMap<String, Object>();
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, listField);
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "1", "value", "a"));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "1", "value", "a"));
script = factory.newScript(params);
script.setNextVar("ctx", ImmutableMap.of("_source", source));
script.run();
// updated second item in list
params = new HashMap<String, Object>();
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, listField);
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "2", "value", "b"));
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, mapOf("key", "2", "value", "b"));
script = factory.newScript(params);
script.setNextVar("ctx", ImmutableMap.of("_source", source));
script.run();
// delete first item
params = new HashMap<String, Object>();
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, listField);
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
- params.put(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, null);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField);
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1");
+ params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, null);
script = factory.newScript(params);
script.setNextVar("ctx", ImmutableMap.of("_source", source));
script.run();
import com.google.common.collect.ImmutableMap;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
index.getSettings().put("analysis.analyzer.default.type", "keyword");
// shards
- boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
+ boolean clusterMode = settings.getBoolean(ProcessProperties.CLUSTER_ACTIVATE);
if (clusterMode) {
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 4);
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1);
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.FileUtils;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
}
private File tomcatBasedir() {
- return new File(props.value(ProcessConstants.PATH_TEMP), "tc");
+ return new File(props.value(ProcessProperties.PATH_TEMP), "tc");
}
void terminate() {
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
static String webappPath(Props props) {
String webDir = props.value("sonar.web.dev.sources");
if (StringUtils.isEmpty(webDir)) {
- webDir = new File(props.value(ProcessConstants.PATH_HOME), "web").getAbsolutePath();
+ webDir = new File(props.value(ProcessProperties.PATH_HOME), "web").getAbsolutePath();
}
Loggers.get(Webapp.class).info(String.format("Webapp directory: %s", webDir));
return webDir;
import org.sonar.core.computation.db.AnalysisReportDto;
import org.sonar.core.persistence.DbSession;
import org.sonar.core.persistence.MyBatis;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.computation.db.AnalysisReportDao;
import org.sonar.server.db.DbClient;
* Never return null but the directory may not exist.
*/
private File reportsDir() {
- return new File(settings.getString(ProcessConstants.PATH_DATA), "analysis");
+ return new File(settings.getString(ProcessProperties.PATH_DATA), "analysis");
}
private File reportFileForUuid(String uuid) {
import org.sonar.api.utils.SonarException;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.io.File;
import java.sql.DriverManager;
@VisibleForTesting
File getDataDirectory(Settings settings) {
- return new File(settings.getString(ProcessConstants.PATH_DATA));
+ return new File(settings.getString(ProcessProperties.PATH_DATA));
}
private String getSetting(String name, String defaultValue) {
import com.google.common.collect.ImmutableMap;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
index.getSettings().put("index.refresh_interval", "-1");
// shards
- boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
+ boolean clusterMode = settings.getBoolean(ProcessProperties.CLUSTER_ACTIVATE);
if (clusterMode) {
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 4);
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1);
import org.sonar.api.platform.ServerFileSystem;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.io.File;
import java.io.FileFilter;
public DefaultServerFileSystem(Settings settings, Server server) {
this.server = server;
- this.homeDir = new File(settings.getString(ProcessConstants.PATH_HOME));
+ this.homeDir = new File(settings.getString(ProcessProperties.PATH_HOME));
}
/**
import org.sonar.api.platform.Server;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.io.File;
import java.io.IOException;
// Remove trailing slashes
.replaceFirst("(\\/+)$", "");
- sonarHome = new File(settings.getString(ProcessConstants.PATH_HOME));
+ sonarHome = new File(settings.getString(ProcessProperties.PATH_HOME));
if (!sonarHome.isDirectory()) {
throw new IllegalStateException("SonarQube home directory is not valid");
}
import org.sonar.api.config.Settings;
import org.sonar.api.platform.Server;
import org.sonar.api.security.SecurityRealm;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.user.SecurityRealmFactory;
import java.util.LinkedHashMap;
attributes.put("Automatic User Creation", getAutomaticUserCreation());
attributes.put("Allow Users to Sign Up", getAllowUsersToSignUp());
attributes.put("Force authentication", getForceAuthentication());
- attributes.put("Home Dir", settings.getString(ProcessConstants.PATH_HOME));
- attributes.put("Data Dir", settings.getString(ProcessConstants.PATH_DATA));
- attributes.put("Logs Dir", settings.getString(ProcessConstants.PATH_LOGS));
- attributes.put("Temp Dir", settings.getString(ProcessConstants.PATH_TEMP));
+ attributes.put("Home Dir", settings.getString(ProcessProperties.PATH_HOME));
+ attributes.put("Data Dir", settings.getString(ProcessProperties.PATH_DATA));
+ attributes.put("Logs Dir", settings.getString(ProcessProperties.PATH_LOGS));
+ attributes.put("Temp Dir", settings.getString(ProcessProperties.PATH_TEMP));
return attributes;
}
import org.sonar.core.qualityprofile.db.ActiveRuleKey;
import org.sonar.core.qualityprofile.db.ActiveRuleParamDto;
import org.sonar.core.qualityprofile.db.QualityProfileDto;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.db.DbClient;
import org.sonar.server.qualityprofile.ActiveRule;
import org.sonar.server.search.BaseNormalizer;
.replicationType(ReplicationType.ASYNC)
.routing(key.ruleKey().toString())
.id(key.toString())
- .script(ProcessConstants.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, ActiveRuleField.PARAMS.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, newParam)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, ActiveRuleParamField.NAME.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getKey())
+ .script(ProcessProperties.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, ActiveRuleField.PARAMS.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, newParam)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, ActiveRuleParamField.NAME.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getKey())
);
}
.replicationType(ReplicationType.ASYNC)
.routing(key.ruleKey().toString())
.id(key.toString())
- .script(ProcessConstants.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, ActiveRuleField.PARAMS.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, null)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, ActiveRuleParamField.NAME.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getKey())
+ .script(ProcessProperties.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, ActiveRuleField.PARAMS.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, null)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, ActiveRuleParamField.NAME.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getKey())
);
}
}
import org.sonar.core.rule.RuleParamDto;
import org.sonar.core.technicaldebt.db.CharacteristicDto;
import org.sonar.markdown.Markdown;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.db.DbClient;
import org.sonar.server.search.BaseNormalizer;
import org.sonar.server.search.IndexField;
return ImmutableList.of(new UpdateRequest()
.id(key.toString())
- .script(ProcessConstants.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, RuleField.PARAMS.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, newParam)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, RuleParamField.NAME.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getName())
+ .script(ProcessProperties.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, RuleField.PARAMS.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, newParam)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, RuleParamField.NAME.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getName())
);
}
private List<UpdateRequest> nestedDelete(RuleParamDto param, RuleKey key) {
return ImmutableList.of(new UpdateRequest()
.id(key.toString())
- .script(ProcessConstants.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_FIELD, RuleField.PARAMS.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_VALUE, null)
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_FIELD, RuleParamField.NAME.field())
- .addScriptParam(ProcessConstants.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getName())
+ .script(ProcessProperties.ES_PLUGIN_LISTUPDATE_SCRIPT_NAME)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, RuleField.PARAMS.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_VALUE, null)
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, RuleParamField.NAME.field())
+ .addScriptParam(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, param.getName())
);
}
import org.picocontainer.Startable;
import org.sonar.api.config.Settings;
import org.sonar.process.LoopbackAddress;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.request.*;
/**
public SearchClient(Settings settings) {
super(ImmutableSettings.settingsBuilder()
- .put("node.name", StringUtils.defaultIfEmpty(settings.getString(ProcessConstants.CLUSTER_NODE_NAME), "sq_local_client"))
- .put("network.bind_host", StringUtils.defaultIfEmpty(settings.getString(ProcessConstants.SEARCH_HOST), "localhost"))
- .put("node.rack_id", StringUtils.defaultIfEmpty(settings.getString(ProcessConstants.CLUSTER_NODE_NAME), "unknown"))
- .put("cluster.name", StringUtils.defaultIfBlank(settings.getString(ProcessConstants.CLUSTER_NAME), "sonarqube"))
+ .put("node.name", StringUtils.defaultIfEmpty(settings.getString(ProcessProperties.CLUSTER_NODE_NAME), "sq_local_client"))
+ .put("network.bind_host", StringUtils.defaultIfEmpty(settings.getString(ProcessProperties.SEARCH_HOST), "localhost"))
+ .put("node.rack_id", StringUtils.defaultIfEmpty(settings.getString(ProcessProperties.CLUSTER_NODE_NAME), "unknown"))
+ .put("cluster.name", StringUtils.defaultIfBlank(settings.getString(ProcessProperties.CLUSTER_NAME), "sonarqube"))
.build());
initLogging();
- this.addTransportAddress(new InetSocketTransportAddress(StringUtils.defaultIfEmpty(settings.getString(ProcessConstants.SEARCH_HOST), LoopbackAddress.get().getHostAddress()),
- settings.getInt(ProcessConstants.SEARCH_PORT)));
+ this.addTransportAddress(new InetSocketTransportAddress(StringUtils.defaultIfEmpty(settings.getString(ProcessProperties.SEARCH_HOST), LoopbackAddress.get().getHostAddress()),
+ settings.getInt(ProcessProperties.SEARCH_PORT)));
}
private void initLogging() {
import com.google.common.collect.ImmutableMap;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
index.getSettings().put("index.refresh_interval", "-1");
// shards
- boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
+ boolean clusterMode = settings.getBoolean(ProcessProperties.CLUSTER_ACTIVATE);
if (clusterMode) {
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 4);
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1);
import org.apache.commons.io.FileUtils;
import org.sonar.api.config.Settings;
import org.sonar.home.cache.FileHashes;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.platform.DefaultServerFileSystem;
import javax.annotation.Nullable;
public void start() {
// see initialization of this property in sonar-application
- String driverPath = settings.getString(ProcessConstants.JDBC_DRIVER_PATH);
+ String driverPath = settings.getString(ProcessProperties.JDBC_DRIVER_PATH);
if (driverPath == null) {
// Medium tests
return;
import org.sonar.core.persistence.Database;
import org.sonar.core.resource.ResourceIndexerDao;
import org.sonar.core.timemachine.Periods;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.component.ComponentCleanerService;
import org.sonar.server.db.migrations.DatabaseMigrator;
import org.sonar.server.measure.MeasureFilterEngine;
}
public String getServerHome() {
- return get(Settings.class).getString(ProcessConstants.PATH_HOME);
+ return get(Settings.class).getString(ProcessProperties.PATH_HOME);
}
public ComponentContainer getContainer() {
import com.google.common.collect.ImmutableMap;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
NewIndex index = context.create(INDEX);
// shards
- boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
+ boolean clusterMode = settings.getBoolean(ProcessProperties.CLUSTER_ACTIVATE);
if (clusterMode) {
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 4);
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1);
import com.google.common.collect.ImmutableMap;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
NewIndex index = context.create(INDEX);
// shards
- boolean clusterMode = settings.getBoolean(ProcessConstants.CLUSTER_ACTIVATE);
+ boolean clusterMode = settings.getBoolean(ProcessProperties.CLUSTER_ACTIVATE);
if (clusterMode) {
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 4);
index.getSettings().put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1);
import org.junit.Test;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
@Test
public void enable_cluster() throws Exception {
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, true);
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, true);
ActivityIndexDefinition def = new ActivityIndexDefinition(settings);
def.define(context);
import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
import org.sonar.api.utils.log.Logger;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
public void enable_access_logs_by_Default() throws Exception {
Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS);
Props props = new Props(new Properties());
- props.set(ProcessConstants.PATH_LOGS, temp.newFolder().getAbsolutePath());
+ props.set(ProcessProperties.PATH_LOGS, temp.newFolder().getAbsolutePath());
sut.configure(tomcat, props);
verify(tomcat.getHost().getPipeline()).addValve(any(ProgrammaticLogbackValve.class));
import org.sonar.core.computation.db.AnalysisReportDto;
import org.sonar.core.persistence.DbSession;
import org.sonar.core.persistence.DbTester;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.component.ComponentTesting;
import org.sonar.server.component.db.ComponentDao;
import org.sonar.server.computation.db.AnalysisReportDao;
@Before
public void setUp() throws Exception {
dataDir = temp.newFolder();
- settings.setProperty(ProcessConstants.PATH_DATA, dataDir.getAbsolutePath());
+ settings.setProperty(ProcessProperties.PATH_DATA, dataDir.getAbsolutePath());
when(system.now()).thenReturn(NOW);
DbClient dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(), new AnalysisReportDao(system));
import org.sonar.api.config.Settings;
import org.sonar.api.database.DatabaseProperties;
import org.sonar.process.NetworkUtils;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.io.File;
import java.io.IOException;
.setProperty(DatabaseProperties.PROP_USER, "login")
.setProperty(DatabaseProperties.PROP_PASSWORD, "pwd")
.setProperty(DatabaseProperties.PROP_EMBEDDED_PORT, "" + port)
- .setProperty(ProcessConstants.PATH_DATA, "./target/testDB");
+ .setProperty(ProcessProperties.PATH_DATA, "./target/testDB");
}
}
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.sonar.process.LoopbackAddress;
import org.sonar.process.NetworkUtils;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import org.sonar.search.SearchServer;
import org.sonar.test.TestUtils;
int port = NetworkUtils.freePort();
Properties properties = new Properties();
- properties.setProperty(ProcessConstants.CLUSTER_NAME, clusterName);
- properties.setProperty(ProcessConstants.CLUSTER_NODE_NAME, nodeName);
- properties.setProperty(ProcessConstants.SEARCH_PORT, String.valueOf(port));
- properties.setProperty(ProcessConstants.SEARCH_HOST, hostName);
- properties.setProperty(ProcessConstants.PATH_HOME, homeDir.getAbsolutePath());
+ properties.setProperty(ProcessProperties.CLUSTER_NAME, clusterName);
+ properties.setProperty(ProcessProperties.CLUSTER_NODE_NAME, nodeName);
+ properties.setProperty(ProcessProperties.SEARCH_PORT, String.valueOf(port));
+ properties.setProperty(ProcessProperties.SEARCH_HOST, hostName);
+ properties.setProperty(ProcessProperties.PATH_HOME, homeDir.getAbsolutePath());
SearchServer server = new SearchServer(new Props(properties));
server.start();
HOLDER = new EsServerHolder(server, clusterName, nodeName, port, hostName, homeDir);
import org.junit.Test;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
@Test
public void enable_cluster() throws Exception {
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, true);
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, true);
IssueIndexDefinition def = new IssueIndexDefinition(settings);
def.define(context);
import org.junit.rules.TemporaryFolder;
import org.sonar.api.CoreProperties;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import java.io.File;
@Before
public void setUp() throws Exception {
- settings = new Settings().setProperty(ProcessConstants.PATH_HOME, sonarHome.getRoot().getAbsolutePath());
+ settings = new Settings().setProperty(ProcessProperties.PATH_HOME, sonarHome.getRoot().getAbsolutePath());
new File(sonarHome.getRoot(), "web/deploy").mkdirs();
server = new ServerImpl(settings, "/org/sonar/server/platform/ServerImplTest/build.properties", "/org/sonar/server/platform/ServerImplTest/version.txt");
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.EsServerHolder;
import java.io.IOException;
public void setup() throws IOException {
EsServerHolder holder = EsServerHolder.get();
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, false);
- settings.setProperty(ProcessConstants.CLUSTER_NAME, holder.getClusterName());
- settings.setProperty(ProcessConstants.CLUSTER_NODE_NAME, holder.getNodeName());
- settings.setProperty(ProcessConstants.SEARCH_PORT, String.valueOf(holder.getPort()));
- settings.setProperty(ProcessConstants.SEARCH_HOST, String.valueOf(holder.getHostName()));
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, false);
+ settings.setProperty(ProcessProperties.CLUSTER_NAME, holder.getClusterName());
+ settings.setProperty(ProcessProperties.CLUSTER_NODE_NAME, holder.getNodeName());
+ settings.setProperty(ProcessProperties.SEARCH_PORT, String.valueOf(holder.getPort()));
+ settings.setProperty(ProcessProperties.SEARCH_HOST, String.valueOf(holder.getHostName()));
searchClient = new SearchClient(settings);
}
import org.junit.Test;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
@Test
public void enable_cluster() throws Exception {
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, true);
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, true);
IndexDefinition def = new SourceLineIndexDefinition(settings);
def.define(context);
import org.sonar.api.resources.Language;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.EsServerHolder;
import org.sonar.server.platform.BackendCleanup;
import org.sonar.server.platform.Platform;
Properties properties = new Properties();
properties.putAll(initialProps);
esServerHolder = EsServerHolder.get();
- properties.setProperty(ProcessConstants.CLUSTER_NAME, esServerHolder.getClusterName());
- properties.setProperty(ProcessConstants.CLUSTER_NODE_NAME, esServerHolder.getNodeName());
- properties.setProperty(ProcessConstants.SEARCH_PORT, String.valueOf(esServerHolder.getPort()));
- properties.setProperty(ProcessConstants.SEARCH_HOST, String.valueOf(esServerHolder.getHostName()));
- properties.setProperty(ProcessConstants.PATH_HOME, homeDir.getAbsolutePath());
- properties.setProperty(ProcessConstants.PATH_DATA, new File(homeDir, "data").getAbsolutePath());
+ properties.setProperty(ProcessProperties.CLUSTER_NAME, esServerHolder.getClusterName());
+ properties.setProperty(ProcessProperties.CLUSTER_NODE_NAME, esServerHolder.getNodeName());
+ properties.setProperty(ProcessProperties.SEARCH_PORT, String.valueOf(esServerHolder.getPort()));
+ properties.setProperty(ProcessProperties.SEARCH_HOST, String.valueOf(esServerHolder.getHostName()));
+ properties.setProperty(ProcessProperties.PATH_HOME, homeDir.getAbsolutePath());
+ properties.setProperty(ProcessProperties.PATH_DATA, new File(homeDir, "data").getAbsolutePath());
properties.setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:" + homeDir.getAbsolutePath() + "/h2");
for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
String key = entry.getKey().toString();
import org.junit.Test;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
@Test
public void enable_cluster() throws Exception {
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, true);
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, true);
UserIndexDefinition def = new UserIndexDefinition(settings);
def.define(context);
import org.junit.Test;
import org.sonar.api.config.Settings;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.server.es.IndexDefinition;
import org.sonar.server.es.NewIndex;
@Test
public void enable_cluster() throws Exception {
Settings settings = new Settings();
- settings.setProperty(ProcessConstants.CLUSTER_ACTIVATE, true);
+ settings.setProperty(ProcessProperties.CLUSTER_ACTIVATE, true);
ViewIndexDefinition def = new ViewIndexDefinition(settings);
def.define(context);
# Elasticsearch port. Default is 9001. Use 0 to get a free port.
# This port must be private and must not be exposed to the Internet.
#sonar.search.port=9001
-# Elasticsearch host. The search server will bind this address and the search client will connect to it. Default ist 127.0.0.1.
+# Elasticsearch host. The search server will bind this address and the search client will connect to it.
+# Default is 127.0.0.1.
#sonar.search.host=127.0.0.1
# plugins not supported).
#sonar.web.dev.sources=/path/to/server/sonar-web/src/main/webapp
-# Uncomment to enable the Elasticsearch HTTP connector, so that ES can be directly requested through
+# Elasticsearch HTTP connector, for example for KOPF:
# http://lmenezes.com/elasticsearch-kopf/?location=http://localhost:9010
-#sonar.search.httpPort=9010
+#sonar.search.httpPort=-1
import org.apache.commons.lang.StringUtils;
import org.sonar.process.MinimumViableSystem;
import org.sonar.process.ProcessCommands;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import org.sonar.process.StopWatcher;
import org.sonar.process.Stoppable;
}
public void start(Props props) {
- if (props.valueAsBoolean(ProcessConstants.ENABLE_STOP_COMMAND, false)) {
- File tempDir = props.nonNullValueAsFile(ProcessConstants.PATH_TEMP);
+ if (props.valueAsBoolean(ProcessProperties.ENABLE_STOP_COMMAND, false)) {
+ File tempDir = props.nonNullValueAsFile(ProcessProperties.PATH_TEMP);
ProcessCommands commands = new ProcessCommands(tempDir, 0);
stopWatcher = new StopWatcher(commands, this);
stopWatcher.start();
List<JavaCommand> createCommands(Props props) {
List<JavaCommand> commands = new ArrayList<>();
- File homeDir = props.nonNullValueAsFile(ProcessConstants.PATH_HOME);
- File tempDir = props.nonNullValueAsFile(ProcessConstants.PATH_TEMP);
+ File homeDir = props.nonNullValueAsFile(ProcessProperties.PATH_HOME);
+ File tempDir = props.nonNullValueAsFile(ProcessProperties.PATH_TEMP);
JavaCommand elasticsearch = new JavaCommand("search");
elasticsearch
.setWorkDir(homeDir)
.addJavaOptions("-Djava.awt.headless=true")
- .addJavaOptions(props.nonNullValue(ProcessConstants.SEARCH_JAVA_OPTS))
- .addJavaOptions(props.nonNullValue(ProcessConstants.SEARCH_JAVA_ADDITIONAL_OPTS))
+ .addJavaOptions(props.nonNullValue(ProcessProperties.SEARCH_JAVA_OPTS))
+ .addJavaOptions(props.nonNullValue(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS))
.setTempDir(tempDir.getAbsoluteFile())
.setClassName("org.sonar.search.SearchServer")
.setArguments(props.rawProperties())
commands.add(elasticsearch);
// do not yet start SQ on elasticsearch slaves
- if (StringUtils.isBlank(props.value(ProcessConstants.CLUSTER_MASTER_HOST))) {
+ if (StringUtils.isBlank(props.value(ProcessProperties.CLUSTER_MASTER_HOST))) {
JavaCommand webServer = new JavaCommand("web")
.setWorkDir(homeDir)
- .addJavaOptions(DefaultSettings.WEB_SERVER_FORCED_JVM_ARGS)
- .addJavaOptions(props.nonNullValue(ProcessConstants.WEB_JAVA_OPTS))
- .addJavaOptions(props.nonNullValue(ProcessConstants.WEB_JAVA_ADDITIONAL_OPTS))
+ .addJavaOptions(ProcessProperties.WEB_ENFORCED_JVM_ARGS)
+ .addJavaOptions(props.nonNullValue(ProcessProperties.WEB_JAVA_OPTS))
+ .addJavaOptions(props.nonNullValue(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS))
.setTempDir(tempDir.getAbsoluteFile())
// required for logback tomcat valve
- .setEnvVariable(ProcessConstants.PATH_LOGS, props.nonNullValue(ProcessConstants.PATH_LOGS))
+ .setEnvVariable(ProcessProperties.PATH_LOGS, props.nonNullValue(ProcessProperties.PATH_LOGS))
.setClassName("org.sonar.server.app.WebServer")
.setArguments(props.rawProperties())
.addClasspath("./lib/common/*")
.addClasspath("./lib/server/*");
- String driverPath = props.value(ProcessConstants.JDBC_DRIVER_PATH);
+ String driverPath = props.value(ProcessProperties.JDBC_DRIVER_PATH);
if (driverPath != null) {
webServer.addClasspath(driverPath);
}
+++ /dev/null
-/*
- * 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.application;
-
-import org.sonar.process.NetworkUtils;
-import org.sonar.process.ProcessConstants;
-import org.sonar.process.Props;
-
-import java.util.HashMap;
-import java.util.Map;
-
-class DefaultSettings {
-
- public static final String WEB_SERVER_FORCED_JVM_ARGS = "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false " +
- // jruby is slow with java 8: https://jira.codehaus.org/browse/SONAR-6115
- "-Djruby.compile.invokedynamic=false";
-
- private DefaultSettings() {
- // only static stuff
- }
-
- static void init(Props props) {
- // forced property
- props.set(ProcessConstants.SEARCH_TYPE, "TRANSPORT");
-
- // init string properties
- for (Map.Entry<String, String> entry : defaults().entrySet()) {
- props.setDefault(entry.getKey(), entry.getValue());
- }
-
- // init ports
- for (Map.Entry<String, Integer> entry : defaultPorts().entrySet()) {
- String key = entry.getKey();
- int port = props.valueAsInt(key, -1);
- if (port == -1) {
- // default port
- props.set(key, String.valueOf((int) entry.getValue()));
- } else if (port == 0) {
- // pick one available port
- props.set(key, String.valueOf(NetworkUtils.freePort()));
- }
- }
- }
-
- private static Map<String, String> defaults() {
- Map<String, String> defaults = new HashMap<>();
- defaults.put(ProcessConstants.CLUSTER_NAME, "sonarqube");
- defaults.put(ProcessConstants.SEARCH_JAVA_OPTS, "-Xmx1G -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
- "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " +
- "-XX:+HeapDumpOnOutOfMemoryError");
- defaults.put(ProcessConstants.SEARCH_JAVA_ADDITIONAL_OPTS, "");
- defaults.put(ProcessConstants.CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis());
- defaults.put(ProcessConstants.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
- defaults.put(ProcessConstants.WEB_JAVA_ADDITIONAL_OPTS, "");
- defaults.put(ProcessConstants.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar");
- defaults.put(ProcessConstants.JDBC_LOGIN, "sonar");
- defaults.put(ProcessConstants.JDBC_PASSWORD, "sonar");
- defaults.put(ProcessConstants.JDBC_MAX_ACTIVE, "50");
- defaults.put(ProcessConstants.JDBC_MAX_IDLE, "5");
- defaults.put(ProcessConstants.JDBC_MIN_IDLE, "2");
- defaults.put(ProcessConstants.JDBC_MAX_WAIT, "5000");
- defaults.put(ProcessConstants.JDBC_MIN_EVICTABLE_IDLE_TIME_MILLIS, "600000");
- defaults.put(ProcessConstants.JDBC_TIME_BETWEEN_EVICTION_RUNS_MILLIS, "30000");
- return defaults;
- }
-
- private static Map<String, Integer> defaultPorts() {
- Map<String, Integer> defaults = new HashMap<>();
- defaults.put(ProcessConstants.SEARCH_PORT, 9001);
- return defaults;
- }
-}
import org.apache.commons.lang.StringUtils;
import org.slf4j.LoggerFactory;
import org.sonar.process.MessageException;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
}
public void checkAndComplete(File homeDir, Props props) {
- String url = props.nonNullValue(ProcessConstants.JDBC_URL);
+ String url = props.nonNullValue(ProcessProperties.JDBC_URL);
Provider provider = driverProvider(url);
checkUrlParameters(provider, url);
String driverPath = driverPath(homeDir, provider);
- props.set(ProcessConstants.JDBC_DRIVER_PATH, driverPath);
+ props.set(ProcessProperties.JDBC_DRIVER_PATH, driverPath);
}
String driverPath(File homeDir, Provider provider) {
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.sonar.process.ConfigurationUtils;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
Props build() throws IOException {
Properties p = loadPropertiesFile(homeDir);
p.putAll(rawProperties);
- p.setProperty(ProcessConstants.PATH_HOME, homeDir.getAbsolutePath());
+ p.setProperty(ProcessProperties.PATH_HOME, homeDir.getAbsolutePath());
p = ConfigurationUtils.interpolateVariables(p, System.getenv());
// the difference between Properties and Props is that the latter
// supports decryption of values, so it must be used when values
// are accessed
Props props = new Props(p);
- DefaultSettings.init(props);
+ ProcessProperties.completeDefaults(props);
// init file system
- initExistingDir(props, ProcessConstants.PATH_DATA, "data");
- initExistingDir(props, ProcessConstants.PATH_WEB, "web");
- initExistingDir(props, ProcessConstants.PATH_LOGS, "logs");
+ initExistingDir(props, ProcessProperties.PATH_DATA, "data");
+ initExistingDir(props, ProcessProperties.PATH_WEB, "web");
+ initExistingDir(props, ProcessProperties.PATH_LOGS, "logs");
initTempDir(props);
// check JDBC properties and set path to driver
Properties p = new Properties();
File propsFile = new File(homeDir, "conf/sonar.properties");
if (propsFile.exists()) {
- try (Reader reader = new InputStreamReader(new FileInputStream(propsFile), Charsets.UTF_8)) {
+ Reader reader = new InputStreamReader(new FileInputStream(propsFile), Charsets.UTF_8);
+ try {
p.load(reader);
+ } finally {
+ IOUtils.closeQuietly(reader);
}
}
return p;
}
private void initTempDir(Props props) throws IOException {
- File dir = configureDir(props, ProcessConstants.PATH_TEMP, "temp");
+ File dir = configureDir(props, ProcessProperties.PATH_TEMP, "temp");
FileUtils.deleteQuietly(dir);
FileUtils.forceMkdir(dir);
}
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.sonar.process.LogbackHelper;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
@Before
public void setUp() throws Exception {
File dir = temp.newFolder();
- props.set(ProcessConstants.PATH_LOGS, dir.getAbsolutePath());
+ props.set(ProcessProperties.PATH_LOGS, dir.getAbsolutePath());
}
@AfterClass
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.ArgumentCaptor;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import org.sonar.process.monitor.JavaCommand;
import org.sonar.process.monitor.Monitor;
private Props initDefaultProps() throws IOException {
Props props = new Props(new Properties());
- DefaultSettings.init(props);
- props.set(ProcessConstants.PATH_HOME, temp.newFolder().getAbsolutePath());
- props.set(ProcessConstants.PATH_TEMP, temp.newFolder().getAbsolutePath());
- props.set(ProcessConstants.PATH_LOGS, temp.newFolder().getAbsolutePath());
+ ProcessProperties.completeDefaults(props);
+ props.set(ProcessProperties.PATH_HOME, temp.newFolder().getAbsolutePath());
+ props.set(ProcessProperties.PATH_TEMP, temp.newFolder().getAbsolutePath());
+ props.set(ProcessProperties.PATH_LOGS, temp.newFolder().getAbsolutePath());
return props;
}
}
+++ /dev/null
-/*
- * 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.application;
-
-import org.junit.Test;
-import org.sonar.process.Props;
-import org.sonar.test.TestUtils;
-
-import java.util.Properties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class DefaultSettingsTest {
-
- @Test
- public void init_defaults() throws Exception {
- Props props = new Props(new Properties());
- DefaultSettings.init(props);
-
- assertThat(props.value("sonar.search.javaOpts")).contains("-Xmx");
- assertThat(props.value("sonar.jdbc.username")).isEqualTo("sonar");
- assertThat(props.valueAsInt("sonar.jdbc.maxActive")).isEqualTo(50);
- }
-
- @Test
- public void do_not_override_existing_properties() throws Exception {
- Properties p = new Properties();
- p.setProperty("sonar.jdbc.username", "angela");
- Props props = new Props(p);
- DefaultSettings.init(props);
-
- assertThat(props.value("sonar.jdbc.username")).isEqualTo("angela");
- }
-
- @Test
- public void use_random_port_if_zero() throws Exception {
- Properties p = new Properties();
- p.setProperty("sonar.search.port", "0");
- Props props = new Props(p);
-
- DefaultSettings.init(props);
- assertThat(props.valueAsInt("sonar.search.port")).isGreaterThan(0);
- }
-
- @Test
- public void private_constructor() throws Exception {
- assertThat(TestUtils.hasOnlyPrivateConstructors(DefaultSettings.class)).isTrue();
- }
-}
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.sonar.process.MessageException;
-import org.sonar.process.ProcessConstants;
+import org.sonar.process.ProcessProperties;
import org.sonar.process.Props;
import java.io.File;
Props props = new Props(new Properties());
props.set("sonar.jdbc.url", "jdbc:oracle:thin:@localhost/XE");
settings.checkAndComplete(home, props);
- assertThat(props.nonNullValueAsFile(ProcessConstants.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
+ assertThat(props.nonNullValueAsFile(ProcessProperties.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
}
@Test
Props props = new Props(new Properties());
props.set("sonar.jdbc.url", "jdbc:h2:tcp://localhost:9092/sonar");
settings.checkAndComplete(home, props);
- assertThat(props.nonNullValueAsFile(ProcessConstants.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
+ assertThat(props.nonNullValueAsFile(ProcessProperties.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
}
@Test
Props props = new Props(new Properties());
props.set("sonar.jdbc.url", "jdbc:postgresql://localhost/sonar");
settings.checkAndComplete(home, props);
- assertThat(props.nonNullValueAsFile(ProcessConstants.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
+ assertThat(props.nonNullValueAsFile(ProcessProperties.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
}
@Test
Props props = new Props(new Properties());
props.set("sonar.jdbc.url", "jdbc:jtds:sqlserver://localhost/sonar;SelectMethod=Cursor");
settings.checkAndComplete(home, props);
- assertThat(props.nonNullValueAsFile(ProcessConstants.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
+ assertThat(props.nonNullValueAsFile(ProcessProperties.JDBC_DRIVER_PATH)).isEqualTo(driverFile);
}
@Test
projects / sonarqube.git / commitdiff