Continued:

- update total peer count in centralized fetch_instances(), not in individual
  network's functions

diff --git a/fba/http/federation.py b/fba/http/federation.py
index ad2495992b2943cb046f71b661bdc7703278606c..fdaec5956ecf681190634dc089a1d6b58d4f4a30 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -86,6 +86,11 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     logger.debug("Fetching instances for domain='%s',software='%s'", domain, software)
     peerlist = fetch_peers(domain, software)
 
+    logger.debug("peerlist[]='%s'", type(peerlist))
+    if isinstance(peerlist, list):
+        logger.debug("Invoking instances.set_total_peerlist(%s,%d) ...", domain, len(peerlist))
+        instances.set_total_peers(domain, peerlist)
+
     if peerlist is None:
         logger.warning("Cannot fetch peers: domain='%s'", domain)
         return
@@ -100,9 +105,9 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
             # Skip "None" types as tidup.domain() cannot parse them
             continue
 
-        logger.debug("instance='%s' - BEFORE", instance)
+        logger.debug("instance='%s' - BEFORE!", instance)
         instance = tidyup.domain(instance)
-        logger.debug("instance='%s' - AFTER", instance)
+        logger.debug("instance='%s' - AFTER!", instance)
 
         if instance == "":
             logger.warning("Empty instance after tidyup.domain(), domain='%s'", domain)

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 2752fa67fbfe401c2c2ab75c0d1123d8aaa77a85..e8bba35004d4b0bbb5dd711620778bc7aa3f6c63 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -75,9 +75,6 @@ def fetch_peers(domain: str) -> list:
         logger.warning("Exception during fetching JSON: domain='%s',exception[%s]:'%s'", domain, type(exception), str(exception))
         instances.set_last_error(domain, exception)
 
-    logger.debug("Adding %d for domain='%s'", len(peers), domain)
-    instances.set_total_peers(domain, peers)
-
     logger.debug("peers()=%d - EXIT!", len(peers))
     return peers
 

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index 1320d06f394b974a14a6e79cf8a37e7e82f78e40..fa169c7b788549a3da3e5154dc15dfac943205f6 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -119,9 +119,6 @@ def fetch_peers(domain: str) -> list:
             logger.debug("Host returned same set of %d instance(s) - BREAK!", already)
             break
 
-    logger.debug("Adding %d for domain='%s'", len(peers), domain)
-    instances.set_total_peers(domain, peers)
-
     logger.debug("peers()=%d - EXIT!", len(peers))
     return peers
 

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index 3007d022f82e736e4fa0948e612108c85de2d8eb..2cfa7f9fcaef17dbc93efea5a172435a0dc0d206 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -86,8 +86,5 @@ def fetch_peers(domain: str) -> list:
                 logger.warning("domain='%s' causes error during API query: '%s' - SKIPPED!", domain, data['error_message'])
                 break
 
-    logger.debug("Adding %d peers for domain='%s'", len(peers), domain)
-    instances.set_total_peers(domain, peers)
-
     logger.debug("Returning peers[]='%s' - EXIT!", type(peers))
     return peers