remove debug

RegioneER · Jul 29, 2024 · db2b125 · db2b125
1 parent 5918e1e
commit db2b125
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,8 +5,8 @@ Changelog
 1.4.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Raise custom exception when there is an error.
+  [cekk]
 
 1.4.0 (2024-05-05)
 ------------------

diff --git a/src/rer/solrpush/browser/maintenance.py b/src/rer/solrpush/browser/maintenance.py
@@ -318,7 +318,7 @@ def sync_contents(
         tot = len(brains_to_sync)
         for brain in brains_to_sync:
             i += 1
-            if i % 10 == 0:
+            if i % 100 == 0:
                 logger.info(f"Progress: {i}/{tot}")
             if not disable_progress:
                 status["counter"] = status["counter"] + 1
@@ -327,9 +327,7 @@ def sync_contents(
             if brain.UID not in solr_items:
                 # missing from solr: try to index it
                 try:
-                    logger.info("send to solr")
                     res = push_to_solr(item)
-                    logger.info("received response from solr")
                     if res:
                         indexed.append(brain.getPath())
                 except SolrError as e:

diff --git a/src/rer/solrpush/restapi/services/solr_search/solr_search_handler.py b/src/rer/solrpush/restapi/services/solr_search/solr_search_handler.py
@@ -6,7 +6,6 @@
 from rer.solrpush.restapi.services.solr_search.batch import SolrHypermediaBatch
 from rer.solrpush.utils import search as solr_search
 
-
 DEFAULT_METADATA_FIELDS = set(
     ["@id", "@type", "description", "review_state", "title"]
 )

diff --git a/src/rer/solrpush/utils/solr_search.py b/src/rer/solrpush/utils/solr_search.py
@@ -26,6 +26,12 @@
 TRIM = re.compile(r"\s+")
 ESCAPE_CHARS_RE = re.compile(r'(?<!\\)(?P<char>[&|+\-!(){}[\]^"~*?:])')
 
+
+class SOLRException(Exception):
+    "Raised when the solr respoonse return an error"
+    pass
+
+
 # HELPER METHODS
 
 
@@ -304,13 +310,12 @@ def search(
         if is_solr_active():
             # log it beacuse it's misconfigured
             logger.error(msg)
-        return {
-            "error": True,
-            "message": translate(
+        raise SOLRException(
+            translate(
                 _("solr_configuration_error_label", default=msg),
                 context=api.portal.get().REQUEST,
-            ),
-        }
+            )
+        )
     solr_query = generate_query(
         query,
         fl=fl,
@@ -323,18 +328,17 @@ def search(
         return res
     except Exception as e:
         logger.exception(e)
-        return {
-            "error": True,
-            "message": translate(
+        raise SOLRException(
+            translate(
                 _(
                     "search_error_label",
                     default="Unable to perform a search with SOLR."
                     " Please contact the site administrator or wait some"
                     " minutes.",
                 ),
                 context=api.portal.get().REQUEST,
-            ),
-        }
+            )
+        )
 
 
 def _set_query_debug(solr, params):