From 3c23df63c7cf9b994180a8483d86e74e4d700cec Mon Sep 17 00:00:00 2001
From: Hayden Shaw <shaw.hayden@gmail.com>
Date: Wed, 17 Oct 2018 09:28:04 +1300
Subject: [PATCH 1/4] Update config.yml

---
 _config/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_config/config.yml b/_config/config.yml
index f06b741..63a8bce 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -5,6 +5,10 @@ SilverStripe\ORM\DataObject:
   extensions:
     - SilverStripe\FullTextSearch\Search\Extensions\SearchUpdater_ObjectHandler
 
+SilverStripe\CMS\Controllers\ContentController:
+  extensions:
+    - SilverStripe\FullTextSearch\Solr\Control\ContentControllerExtension
+    
 SilverStripe\Core\Injector\Injector:
   SilverStripe\FullTextSearch\Search\Queries\SearchQuery:
     calls:

From decd040c5555cbddc44a8819a4731599c1bfe50b Mon Sep 17 00:00:00 2001
From: James Ayers <james@leapfrogdesign.co.nz>
Date: Thu, 25 Oct 2018 12:27:49 +1300
Subject: [PATCH 2/4] Update Process timeout via Config

---
 src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
index db5db3b..66409f6 100644
--- a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
+++ b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
@@ -97,6 +97,13 @@ class SolrReindexImmediateHandler extends SolrReindexBase
 
         // Execute script via shell
         $process = new Process($cmd);
+
+        // Set timeout from config. Process default is 60 seconds.
+        $timeout = Config::inst()->get(static::class, 'process_timeout');
+        if ($timeout) {
+            $process->setTimeout($timeout);
+        }
+
         $process->inheritEnvironmentVariables();
         $process->run();
 

From cf26795019b72f86b85edcb78a0bc70010c58386 Mon Sep 17 00:00:00 2001
From: James Ayers <james@leapfrogdesign.co.nz>
Date: Thu, 25 Oct 2018 21:59:20 +1300
Subject: [PATCH 3/4] Change config method & default timeout to null to
 disable.

---
 src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
index 66409f6..a06244d 100644
--- a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
+++ b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
@@ -98,11 +98,8 @@ class SolrReindexImmediateHandler extends SolrReindexBase
         // Execute script via shell
         $process = new Process($cmd);
 
-        // Set timeout from config. Process default is 60 seconds.
-        $timeout = Config::inst()->get(static::class, 'process_timeout');
-        if ($timeout) {
-            $process->setTimeout($timeout);
-        }
+        // Set timeout from config. Process default is 60 seconds
+        $process->setTimeout($this->config()->get('process_timeout'));
 
         $process->inheritEnvironmentVariables();
         $process->run();

From 2323b7f2cdb37ee2542a800be258145f6caeadb2 Mon Sep 17 00:00:00 2001
From: James Ayers <james@leapfrogdesign.co.nz>
Date: Tue, 30 Oct 2018 20:44:51 +1300
Subject: [PATCH 4/4] FIX: Use Configurable trait

---
 src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
index a06244d..8bd2520 100644
--- a/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
+++ b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
@@ -11,6 +11,7 @@ use SilverStripe\FullTextSearch\Solr\Solr;
 use SilverStripe\FullTextSearch\Solr\SolrIndex;
 use SilverStripe\ORM\DB;
 use Symfony\Component\Process\Process;
+use SilverStripe\Core\Config\Configurable;
 
 /**
  * Invokes an immediate reindex
@@ -19,6 +20,9 @@ use Symfony\Component\Process\Process;
  */
 class SolrReindexImmediateHandler extends SolrReindexBase
 {
+
+    use Configurable;
+    
     /**
      * Path to the php binary
      * @config