Merge pull request #38 from wilr/wilr-patch-1

Catch exception when no keys
wilr · Mar 7, 2021 · e339b93 · e339b93
2 parents bcaf860 + 053fcc6
commit e339b93
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/src/Service/AlgoliaService.php b/src/Service/AlgoliaService.php
@@ -8,6 +8,8 @@
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Dev\Debug;
+use SilverStripe\Security\Security;
 
 class AlgoliaService
 {
@@ -56,10 +58,30 @@ public function getClient()
      */
     public function initIndexes($item = null)
     {
+        if (!Security::database_is_ready()) {
+            return [];
+        }
+
+        try {
+            $client = $this->getClient();
+
+            if (!$client) {
+                return [];
+            }
+        } catch (Exception $e) {
+            Injector::inst()->create(LoggerInterface::class)->error($e);
+
+            if (Director::isDev()) {
+                Debug::message($e->getMessage());
+            }
+
+            return [];
+        }
+
         if (!$item) {
             return array_map(
-                function ($indexName) {
-                    return $this->getClient()->initIndex($this->environmentizeIndex($indexName));
+                function ($indexName) use ($client) {
+                    return $client->initIndex($this->environmentizeIndex($indexName));
                 },
                 array_keys($this->indexes)
             );
@@ -90,7 +112,7 @@ function ($indexName) {
         $output = [];
 
         foreach ($matches as $index) {
-            $output[$index] = $this->getClient()->initIndex($this->environmentizeIndex($index));
+            $output[$index] = $client->initIndex($this->environmentizeIndex($index));
         }
 
         return $output;