Merge pull request #14 from CheapHasz/remove-elasticsearch-support

Remove elasticsearch support
novaway · Oct 1, 2020 · 2161a94 · 2161a94
2 parents 21fc08e + 8efc487
commit 2161a94
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 89 deletions.
diff --git a/src/Elasticsearch/Client.php b/src/Elasticsearch/Client.php
diff --git a/src/Elasticsearch/ClientBuilder.php b/src/Elasticsearch/ClientBuilder.php
diff --git a/src/Factory/ClientFactory.php b/src/Factory/ClientFactory.php
diff --git a/src/Provider/IndexProvider.php b/src/Provider/IndexProvider.php
@@ -72,6 +72,8 @@ public function rebuildIndex($markAsLive = true, $removeOldIndexes = true): Inde
      * @param Index $index The index to link to the $this->name alias
      * @param bool $removeOldIndexes If true, remove the indexes currently linked to $this->name alias after marking $index as live
      *
+     * @throws \Exception if the index couldn't be marked as live
+     *
      * @return bool index is markedAsLive
      */
     public function markAsLive(Index $index, bool $removeOldIndexes = true): bool
@@ -95,7 +97,7 @@ public function markAsLive(Index $index, bool $removeOldIndexes = true): bool
             }
             // and delete the failed one
             $index->delete();
-            return false;
+            throw $e;
         }
         if ($removeOldIndexes) {
             // if everything went well, the new index is set as the alias
@@ -109,7 +111,7 @@ public function markAsLive(Index $index, bool $removeOldIndexes = true): bool
 
         return true;
     }
-    
+
     protected function getIndexByName($name): Index
     {
         return new Index($this->eventDispatcher, $this->client, $name);

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -6,7 +6,6 @@
     <services>
         <defaults autoconfigure="true" autowire="true" public="false" />
 
-        <service id="Novaway\ElasticsearchBundle\Factory\ClientFactory" />
         <service id="Novaway\ElasticsearchBundle\DataCollector\ElasticsearchDataCollector">
             <tag name="data_collector"
                  template="@NovawayElasticsearch/data_collector/template.html.twig"