Continued:

- update instance data just before exiting federation.fetch_instances()

diff --git a/fba/commands.py b/fba/commands.py
index a915596cf9c1833fd80696cbf9b8f99859ef48b2..8812cf1e0e888d3cda6ff7cc39dbd752477c50a1 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -713,6 +713,7 @@ def fetch_instances(args: argparse.Namespace) -> int:
     except network.exceptions as exception:
         logger.warning("Exception '%s' during fetching instances (fetch_instances) from args.domain='%s'", type(exception), args.domain)
         instances.set_last_error(args.domain, exception)
+        instances.update_data(args.domain)
         return 100
 
     if args.single:

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 630b87b50221796cbd11f90bd8f374972cfb8f6b..844fe2851395ade04ac064f719e32968e73fb7fc 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -90,11 +90,6 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
         logger.debug("Invoking instances.set_total_peerlist(%s,%d) ...", domain, len(peerlist))
         instances.set_total_peers(domain, peerlist)
 
-    logger.debug("Checking if domain='%s' has pending updates ...", domain)
-    if instances.has_pending(domain):
-        logger.debug("Flushing updates for domain='%s' ...", domain)
-        instances.update_data(domain)
-
     logger.debug("peerlist[]='%s'", type(peerlist))
     if peerlist is None:
         logger.warning("Cannot fetch peers: domain='%s'", domain)
@@ -135,6 +130,11 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     logger.debug("Invoking cookies.clear(%s) ...", domain)
     cookies.clear(domain)
 
+    logger.debug("Checking if domain='%s' has pending updates ...", domain)
+    if instances.has_pending(domain):
+        logger.debug("Flushing updates for domain='%s' ...", domain)
+        instances.update_data(domain)
+
     logger.debug("EXIT!")
 
 def fetch_peers(domain: str, software: str, origin: str) -> list: