[KunstmaanNodeSearchBundle] use hosts in useVersion6 check (#2075)

Kunstmaan · Aug 21, 2018 · b6d2674 · b6d2674
1 parent f4c5f67
commit b6d2674
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/Configuration.php b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/Configuration.php
@@ -15,6 +15,21 @@
  */
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * @var bool
+     */
+    private $useElasticSearchVersion6;
+
+
+    /**
+     * Configuration constructor.
+     * @param bool $useElasticSearchVersion6
+     */
+    public function __construct($useElasticSearchVersion6)
+    {
+        $this->useElasticSearchVersion6 = $useElasticSearchVersion6;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -36,13 +51,13 @@ public function getConfigTreeBuilder()
             'boolean',
             'binary',
         ];
-        if (!ElasticSearchUtil::useVersion6()) {
+        if (!$this->useElasticSearchVersion6) {
             $types[] = 'string';
         }
 
         $properties->children()->scalarNode('type')->beforeNormalization()->ifNotInArray($types)->thenInvalid('type must be one of: ' . implode(', ', $types));
 
-        if (ElasticSearchUtil::useVersion6()) {
+        if ($this->useElasticSearchVersion6) {
             $properties->children()->booleanNode('fielddata');
             $properties->children()->booleanNode('doc_values');
             $properties->children()

diff --git a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php
@@ -16,12 +16,17 @@
  */
 class KunstmaanNodeSearchExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * @var bool
+     */
+    private $useElasticSearchVersion6;
+
     /**
      * {@inheritDoc}
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
+        $configuration = new Configuration($this->useElasticSearchVersion6);
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
@@ -49,7 +54,9 @@ public function load(array $configs, ContainerBuilder $container)
      */
     public function prepend(ContainerBuilder $container)
     {
-        if (ElasticSearchUtil::useVersion6()) {
+        $this->useElasticSearchVersion6 = ElasticSearchUtil::useVersion6(array($container->getParameter('kunstmaan_search.hostname').':'.$container->getParameter('searchport')));
+
+        if ($this->useElasticSearchVersion6) {
             $mapping = [
                 'mapping' => [
                     'root_id' => [

diff --git a/src/Kunstmaan/NodeSearchBundle/Helper/ElasticSearchUtil.php b/src/Kunstmaan/NodeSearchBundle/Helper/ElasticSearchUtil.php
@@ -14,15 +14,17 @@ final class ElasticSearchUtil
     private static $esClientInfo;
 
     /**
+     * @var array $hosts
+     *
      * @return bool
      */
-    public static function useVersion6()
+    public static function useVersion6($hosts = array())
     {
         if (PHP_MAJOR_VERSION < 7) {
             return false;
         }
 
-        $info = self::getESVersionInfo();
+        $info = self::getESVersionInfo($hosts);
 
         if (null !== $info) {
             $versionParts = explode('.', $info['version']['number']);
@@ -35,13 +37,15 @@ public static function useVersion6()
     }
 
     /**
+     * @var array $hosts
+     *
      * @return array
      */
-    private static function getESVersionInfo()
+    private static function getESVersionInfo($hosts)
     {
         try {
             if (null === self::$esClientInfo) {
-                $client = ClientBuilder::create()->build();
+                $client = ClientBuilder::create()->setHosts($hosts)->build();
                 self::$esClientInfo = $client->info();
             }
         } catch (NoNodesAvailableException $e) {