diff --git a/code/search/processors/SearchUpdateCommitJobProcessor.php b/code/search/processors/SearchUpdateCommitJobProcessor.php
index 35144a1..a75530a 100644
--- a/code/search/processors/SearchUpdateCommitJobProcessor.php
+++ b/code/search/processors/SearchUpdateCommitJobProcessor.php
@@ -8,7 +8,7 @@ class SearchUpdateCommitJobProcessor implements QueuedJob
{
/**
* The QueuedJob queue to use when processing commits
- *
+ *
* @config
* @var int
*/
@@ -47,12 +47,12 @@ class SearchUpdateCommitJobProcessor implements QueuedJob
*
* @var array
*/
- public static $dirty_indexes = true;
+ public static $dirty_indexes = array();
/**
* If solrindex::commit has already been performed, but additional commits are necessary,
* how long do we wait before attempting to touch the index again?
- *
+ *
* {@see http://stackoverflow.com/questions/7512945/how-to-fix-exceeded-limit-of-maxwarmingsearchers}
*
* @var int
@@ -154,7 +154,7 @@ class SearchUpdateCommitJobProcessor implements QueuedJob
return;
}
-
+
// If any commit has run, but some (or all) indexes are un-comitted, we must re-schedule this task.
// This could occur if we completed a searchupdate job in a prior request, as well as in
// the current request
diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index fb460fa..9921d27 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -240,6 +240,10 @@ class Solr_Configure extends Solr_BuildTask
->error("Failure: " . $e->getMessage());
}
}
+
+ if (isset($e)) {
+ exit(1);
+ }
}
/**
diff --git a/conf/solr/3/templates/types.ss b/conf/solr/3/templates/types.ss
index 135c8ac..f516654 100644
--- a/conf/solr/3/templates/types.ss
+++ b/conf/solr/3/templates/types.ss
@@ -140,7 +140,6 @@
-
+
@@ -166,11 +166,11 @@
-
+
@@ -180,7 +180,6 @@
-
@@ -189,6 +188,7 @@
+
@@ -214,7 +214,6 @@
-
+
@@ -240,7 +240,6 @@
-
+
diff --git a/conf/solr/4/templates/types.ss b/conf/solr/4/templates/types.ss
index fe0f4fc..974ee2d 100644
--- a/conf/solr/4/templates/types.ss
+++ b/conf/solr/4/templates/types.ss
@@ -140,7 +140,6 @@
-
+
@@ -166,12 +166,12 @@
-
+
@@ -180,7 +180,6 @@
-
@@ -189,6 +188,7 @@
+
@@ -225,7 +225,6 @@
-
+
@@ -251,7 +251,6 @@
-
+