MDL-53247 search: Require search to be available before running index…

…er script
pbhwheeler · Mar 9, 2016 · ee72a4d · ee72a4d
1 parent f758ad3
commit ee72a4d
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/search/cli/indexer.php b/search/cli/indexer.php
@@ -56,6 +56,17 @@
     cli_error('Global search is disabled. Use --force if you want to force an index while disabled');
 }
 
+if (!$searchengine = \core_search\manager::search_engine_instance()) {
+    cli_error(get_string('engineserverstatus', 'search'));
+}
+if (!$searchengine->is_installed()) {
+    cli_error('enginenotinstalled', 'search', $CFG->searchengine);
+}
+$serverstatus = $searchengine->is_server_ready();
+if ($serverstatus !== true) {
+    cli_error($serverstatus);
+}
+
 $globalsearch = \core_search\manager::instance();
 
 if (empty($options['reindex'])) {