Continued:

- try/except for fetching peers

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 844fe2851395ade04ac064f719e32968e73fb7fc..79385eaa3ea85967693d3d8dcd8a71af4a637079 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -82,8 +82,12 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     logger.debug("Updating last_instance_fetch for domain='%s' ...", domain)
     instances.set_last_instance_fetch(domain)
 
-    logger.debug("Fetching instances for domain='%s',software='%s',origin='%s'", domain, software, origin)
-    peerlist = fetch_peers(domain, software, origin)
+    peerlist = list()
+    try:
+        logger.debug("Fetching instances for domain='%s',software='%s',origin='%s'", domain, software, origin)
+        peerlist = fetch_peers(domain, software, origin)
+    except network.exceptions as exception:
+        logger.warning("Cannot fetch peers from domain='%s': '%s'", domain, type(exception))
 
     logger.debug("peerlist[]='%s'", type(peerlist))
     if isinstance(peerlist, list):
@@ -91,7 +95,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
         instances.set_total_peers(domain, peerlist)
 
     logger.debug("peerlist[]='%s'", type(peerlist))
-    if peerlist is None:
+    if peerlist is None or len(peerlist) == 0:
         logger.warning("Cannot fetch peers: domain='%s'", domain)
 
         logger.debug("Invoking cookies.clear(%s) ...", domain)