tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change config method & default timeout to null to disable.

This commit is contained in:
James Ayers 2018-10-25 21:59:20 +13:00 committed by Robbie Averill
parent decd040c55
commit cf26795019
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
View File

@ -98,11 +98,8 @@ class SolrReindexImmediateHandler extends SolrReindexBase
// Execute script via shell // Execute script via shell
$process = new Process($cmd); $process = new Process($cmd);
// Set timeout from config. Process default is 60 seconds. // Set timeout from config. Process default is 60 seconds
$timeout = Config::inst()->get(static::class, 'process_timeout'); $process->setTimeout($this->config()->get('process_timeout'));
if ($timeout) {
$process->setTimeout($timeout);
}
$process->inheritEnvironmentVariables(); $process->inheritEnvironmentVariables();
$process->run(); $process->run();