Continued:

- also check blacklist first, before invoking instances.is_recent()

diff --git a/fba/commands.py b/fba/commands.py
index 8ae57220907e5a9a3fd409b19e30f2a23eff4137..2d2635703a0e391882c5b31e0c9f618bb9a22b20 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1272,11 +1272,11 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
     logger.info("Checking %d domains ...", len(rows))
     for row in rows:
         logger.debug("Fetching peers from domain='%s',software='%s',nodeinfo_url='%s' ...", row["domain"], row["software"], row["nodeinfo_url"])
-        if (args.force is None or not args.force) and args.domain is None and args.software is None and instances.is_recent(row["domain"], "last_blocked"):
-            logger.debug("row[domain]='%s' has been recently checked, args.force[]='%s' - SKIPPED!", row["domain"], type(args.force))
+        if blacklist.is_blacklisted(row["domain"]):
+            logger.debug("row[domain]='%s' is blacklisted - SKIPPED!", row["domain"])
             continue
-        elif blacklist.is_blacklisted(row["domain"]):
-            logger.warning("row[domain]='%s' is blacklisted - SKIPPED!", row["domain"])
+        elif (args.force is None or not args.force) and args.domain is None and args.software is None and instances.is_recent(row["domain"], "last_blocked"):
+            logger.debug("row[domain]='%s' has been recently checked, args.force[]='%s' - SKIPPED!", row["domain"], type(args.force))
             continue
 
         logger.debug("Invoking federation.fetch_blocks(%s) ...", row["domain"])

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index d0df8aab081e3116d18d097781e40a27dc0db42e..07e937172ea9df47af52c2021fe2999a44b87581 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -226,7 +226,7 @@ def csv_block(blocker: str, url: str, command: str):
             logger.debug("domain='%s' is not a valid domain - SKIPPED!")
             continue
         elif blacklist.is_blacklisted(domain):
-            logger.warning("domain='%s' is blacklisted - SKIPPED!", domain)
+            logger.debug("domain='%s' is blacklisted - SKIPPED!", domain)
             continue
         elif blocks.is_instance_blocked(blocker, domain, severity):
             logger.debug("blocker='%s' has already blocked domain='%s' with severity='%s' - SKIPPED!", blocker, domain, severity)