opendev/gerrit
Code Issues Proposed changes

Merge changes Iac79af54,Ief41eccc,Iae52ade9,I0bd9eabb,I2ef5b9e1

Browse Source 
* changes:
  Solr index requires SolrCloud rather than plain Solr
  Handle exceptions during reindexing
  InitIndex: Allow user to configure the Solr index URL
  Solr index URL should be configured under the main "index" section
  Improve information message about rebuilding the index
This commit is contained in:
Shawn Pearce
2014-02-13 17:02:23 +00:00
committed by Gerrit Code Review
parent d94c613af5 396e09dbf4
commit 4d42596868
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-solr/src/main/java/com/google/gerrit/solr/SolrChangeIndex.java
View File

@@ -103,9 +103,9 @@ class SolrChangeIndex implements ChangeIndex, LifecycleListener {
this.indexes = indexes;
this.schema = schema;
String url = cfg.getString("index", "solr", "url");
String url = cfg.getString("index", null, "url");
if (Strings.isNullOrEmpty(url)) {
throw new IllegalStateException("index.solr.url must be supplied");
throw new IllegalStateException("index.url must be supplied");
}
// Version is only used to determine the list of stop words used by the