L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-53281 search: Properly set timeout, and don't wait for optimize

Browse Source
This commit is contained in:
Eric Merrill
2016-03-09 13:30:18 +08:00
committed by Damyon Wiese
parent be8b6b489a
commit 9502c7f539
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search/engine/solr/classes/engine.php
+2 -1
View File
@@ -327,7 +327,7 @@ class engine extends \core_search\engine {
* @return void
*/
public function optimize() {
$this->get_search_client()->optimize();
$this->get_search_client()->optimize(1, true, false);
}
/**
@@ -424,6 +424,7 @@ class engine extends \core_search\engine {
'ssl_password' => !empty($this->config->ssl_keypassword) ? $this->config->ssl_keypassword : '',
'ssl_cainfo' => !empty($this->config->ssl_cainfo) ? $this->config->ssl_cainfo : '',
'ssl_capath' => !empty($this->config->ssl_capath) ? $this->config->ssl_capath : '',
'timeout' => !empty($this->config->server_timeout) ? $this->config->server_timeout : '30'
);
$this->client = new \SolrClient($options);