Fixes that elastic search is crashing the site when it's not configur…

…ed. (#17138)
OrchardCMS · Dec 6, 2024 · 979833a · 979833a
1 parent e7dbd6d
commit 979833a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchClientFactory.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchClientFactory.cs
@@ -14,7 +14,7 @@ public static ElasticsearchClient Create(ElasticsearchConnectionOptions elasticC
             ElasticsearchConnectionType.StaticConnectionPool => new ElasticsearchClientSettings(new StaticNodePool(GetNodeUris(elasticConfiguration))),
             ElasticsearchConnectionType.SniffingConnectionPool => new ElasticsearchClientSettings(new SniffingNodePool(GetNodeUris(elasticConfiguration))),
             ElasticsearchConnectionType.StickyConnectionPool => new ElasticsearchClientSettings(new StickyNodePool(GetNodeUris(elasticConfiguration))),
-            _ => new ElasticsearchClientSettings(GetNodeUris(elasticConfiguration).First()),
+            _ => new ElasticsearchClientSettings(GetNodeUris(elasticConfiguration).FirstOrDefault()),
         };
 
         if (!string.IsNullOrWhiteSpace(elasticConfiguration.CertificateFingerprint))
@@ -29,6 +29,11 @@ public static ElasticsearchClient Create(ElasticsearchConnectionOptions elasticC
 
     private static IEnumerable<Uri> GetNodeUris(ElasticsearchConnectionOptions elasticConfiguration)
     {
+        if (string.IsNullOrEmpty(elasticConfiguration.Url))
+        {
+            return [];
+        }
+
         return elasticConfiguration.Ports.Select(port => new Uri($"{elasticConfiguration.Url}:{port}")).Distinct();
     }
 }