Continued:

[fba.git] / fba / networks / lemmy.py

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index bfe1e805f0eed78685d3fa7669de0bb966aca2ac..52b21953fc00058df67e2de420cf1c7ca2bd4bd5 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -101,18 +101,20 @@ def fetch_peers(domain: str, origin: str) -> list:
 
         logger.debug("data[]='%s'", type(data))
         if "error_message" in data:
-            logger.warning("Could not reach any JSON API: domain='%s'", domain)
+            logger.warning("Could not reach any JSON API: domain='%s',error_message='%s'", domain, data["error_message"])
             instances.set_last_error(domain, data)
         elif "federated_instances" in data["json"] and isinstance(data["json"]["federated_instances"], dict):
             logger.debug("Found federated_instances for domain='%s'", domain)
             peers = peers + federation.add_peers(data["json"]["federated_instances"])
+            logger.debug("peers()=%d after adding", len(peers))
 
             logger.debug("Marking domain='%s' as successfully handled ...", domain)
             instances.set_success(domain)
 
         if len(peers) == 0:
-            logger.warning("Fetching instances for domain='%s' from /instances ...", domain)
+            logger.debug("Fetching instances for domain='%s' from /instances ...", domain)
             peers = fetch_instances(domain, origin)
+            logger.debug("peers()=%d after fetch_instances(%s, %s)", len(peers), domain, origin)
 
     except network.exceptions as exception:
         logger.warning("Exception during fetching JSON: domain='%s',exception[%s]:'%s'", domain, type(exception), str(exception))
@@ -145,13 +147,12 @@ def fetch_blocks(domain: str) -> list:
         logger.debug("response.ok='%s',response.status_code=%d,response.text()=%d", response.ok, response.status_code, len(response.text))
         if response.ok and response.status_code == 200 and response.text != "":
             logger.debug("Parsing %s Bytes ...", len(response.text))
-
             doc = bs4.BeautifulSoup(response.text, "html.parser")
             logger.debug("doc[]='%s'", type(doc))
 
             found = None
             for criteria in [{"class": "home-instances container-lg"}, {"class": "container"}]:
-                logger.debug("criteria='%s'", criteria)
+                logger.debug("Trying to find criteria='%s' ...", criteria)
                 containers = doc.findAll("div", criteria)
 
                 logger.debug("Checking %d containers ...", len(containers))
@@ -274,8 +275,8 @@ def fetch_instances(domain: str, origin: str) -> list:
                     for tag in rows:
                         logger.debug("tag[]='%s'", type(tag))
                         text = tag.contents[0] if isinstance(tag.contents[0], str) else tag.contents[0].text
-                        logger.debug("text='%s' - BEFORE!", text)
 
+                        logger.debug("text='%s' - BEFORE!", text)
                         peer = tidyup.domain(text) if text != "" else None
                         logger.debug("peer='%s' - AFTER", peer)