Continued:

[fba.git] / fba / helpers / processing.py

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index 37a47065be200e2e2b01f1dacb5ced8de506c837..d0df8aab081e3116d18d097781e40a27dc0db42e 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -36,8 +36,8 @@ from fba.models import instances
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-def instance(blocked: str, blocker: str, command: str) -> bool:
-    logger.debug("blocked='%s',blocker='%s',command='%s' - CALLED!", blocked, blocker, command)
+def instance(blocked: str, blocker: str, command: str, force: bool = False) -> bool:
+    logger.debug("blocked='%s',blocker='%s',command='%s',force='%s' - CALLED!", blocked, blocker, command, force)
     domain_helper.raise_on(blocked)
     domain_helper.raise_on(blocker)
 
@@ -61,16 +61,18 @@ def instance(blocked: str, blocker: str, command: str) -> bool:
 
     logger.debug("Checking blocked='%s' if wanted and recent ...", blocked)
     if not domain_helper.is_wanted(blocked):
-        logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
+        logger.debug("blocked='%s' is not wanted - EXIT!", blocked)
         return False
-    elif instances.is_recent(blocked):
-        logger.debug("blocked='%s' has been recently checked - SKIPPED!", blocked)
+    elif not force and instances.is_recent(blocked):
+        logger.debug("blocked='%s' has been recently checked - EXIT!", blocked)
         return False
 
     processed = False
     try:
         logger.info("Fetching instances for blocked='%s',blocker='%s',command='%s' ...", blocked, blocker, command)
         federation.fetch_instances(blocked, blocker, None, command)
+
+        logger.debug("Setting processed=True for blocked='%s',blocker='%s' ...", blocked, blocker)
         processed = True
     except network.exceptions as exception:
         logger.warning("Exception '%s' during fetching instances (%s) from blocked='%s'", type(exception), command, blocked)