From ee72a4dbf3eb454032b21777ad84cd3b58ce8984 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Wed, 9 Mar 2016 13:37:33 +0800 Subject: [PATCH] MDL-53247 search: Require search to be available before running indexer script --- search/cli/indexer.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/search/cli/indexer.php b/search/cli/indexer.php index b40a20b7a0d..f42b8e979ba 100644 --- a/search/cli/indexer.php +++ b/search/cli/indexer.php @@ -56,6 +56,17 @@ if (!\core_search\manager::is_global_search_enabled() && empty($options['force'] 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'])) {