Merge branch 'main' into mle-plone-host

.github/workflows/tests.yml

@@ -17,15 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10"]
         plone: ["6.0-latest", "5.2-latest"]
         exclude:
           - plone: "5.2-latest"
             python: "3.9"
           - plone: "5.2-latest"
             python: "3.10"
           - plone: "6.0-latest"
-            python: "3.7"
+            python: "3.8"
+          - plone: "6.0-latest"
+            python: "3.9"
 
     steps:
       # git checkout

CHANGELOG.md

@@ -22,6 +22,8 @@
 
 - Add support for multiple plone sites on one installation via PLONE_BACKEND_HOST @maethu
 
+- [Issue #118](https://github.com/collective/collective.elasticsearch/issues/118) Fix **ComponentLookupError** when adding a Plone Site (6.1) (@andreclimaco)
+
 
 ## 5.0.0 (2022-10-11)
 

src/collective/elasticsearch/manager.py

@@ -17,6 +17,7 @@
 from zope.component import getMultiAdapter
 from zope.globalrequest import getRequest
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 from ZTUtils.Lazy import LazyMap
 
 import os
@@ -41,7 +42,7 @@ def raise_search_exception(self):
             value = api.portal.get_registry_record(
                 "raise_search_exception", interfaces.IElasticSettings, False
             )
-        except KeyError:
+        except (KeyError, ComponentLookupError):
             value = False
         return value
 
@@ -118,7 +119,7 @@ def enabled(self):
             value = api.portal.get_registry_record(
                 "enabled", interfaces.IElasticSettings, False
             )
-        except KeyError:
+        except (KeyError, ComponentLookupError):
             value = False
         return value
 

src/collective/elasticsearch/redis/tasks.py

@@ -81,6 +81,7 @@ def bulk_update(hosts, params, index_name, body, plone_url):
     return "Done"
 
 
+
 @job(queue_low, connection=queue_low.connection)
 def update_file_data(hosts, params, index_name, body, plone_url):
     """

src/collective/elasticsearch/utils.py

@@ -41,8 +41,8 @@ def get_brain_from_path(zcatalog: ZCatalog, path: str) -> AbstractCatalogBrain:
 
 def get_settings():
     """Return IElasticSettings values."""
-    registry = getUtility(IRegistry)
     try:
+        registry = getUtility(IRegistry)
         settings = registry.forInterface(IElasticSettings, check=False)
     except Exception:  # noQA
         settings = None