Continued:

- messages fixed

diff --git a/fba/commands.py b/fba/commands.py
index 7f55ff5444b61b2ee332ed23d5b2eba512ce950d..88f8216c065314ab9f692b0296973584c7e008d7 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -1381,29 +1381,29 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
 
         logger.debug("blocking()=%d", len(blocking))
         if len(blocking) == 0:
-            logger.debug("Empty blocking list, trying individual fetch_blocks() for row[software]='%s' ...", row["software"])
+            logger.debug("Empty blocking list, trying individual fetch_blocks() for row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
             if row["software"] == "pleroma":
-                logger.debug("domain='%s',software='%s'", row["domain"], row["software"])
+                logger.debug("Fetching blocks from row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
                 blocking = pleroma.fetch_blocks(row["domain"])
             elif row["software"] == "mastodon":
-                logger.debug("domain='%s',software='%s'", row["domain"], row["software"])
+                logger.debug("Fetching blocks from row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
                 blocking = mastodon.fetch_blocks(row["domain"])
             elif row["software"] == "lemmy":
-                logger.debug("domain='%s',software='%s'", row["domain"], row["software"])
+                logger.debug("Fetching blocks from row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
                 blocking = lemmy.fetch_blocks(row["domain"])
             elif row["software"] == "friendica":
-                logger.debug("domain='%s',software='%s'", row["domain"], row["software"])
+                logger.debug("Fetching blocks from row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
                 blocking = friendica.fetch_blocks(row["domain"])
             elif row["software"] == "misskey":
-                logger.debug("domain='%s',software='%s'", row["domain"], row["software"])
+                logger.debug("Fetching blocks from row[domain]='%s',row[software]='%s' ...", row["domain"], row["software"])
                 blocking = misskey.fetch_blocks(row["domain"])
             else:
-                logger.warning("Unknown software: domain='%s',software='%s'", row["domain"], row["software"])
+                logger.warning("Unknown software: row[domain]='%s',row[software]='%s'", row["domain"], row["software"])
 
         # c.s isn't part of oliphant's "hidden" blocklists
         logger.debug("row[domain]='%s'", row["domain"])
         if row["domain"] != "chaos.social" and row["software"] is not None and not software_helper.is_relay(row["software"]) and not blocklists.has(row["domain"]):
-            logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", row["domain"], len(blocking))
+            logger.debug("Invoking instances.set_total_blocks(%s,%d) ...", row["domain"], len(blocking))
             instances.set_last_blocked(row["domain"])
             instances.set_total_blocks(row["domain"], blocking)
 
@@ -1879,7 +1879,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
                         logger.debug("domain='%s' already added", domain)
                         continue
 
-                    logger.debug("Appending domain='%s',origin='%s',software='%s' ...", domain, row["domain"], row["software"])
+                    logger.debug("Appending domain='%s',row[domain]='%s',row[software]='%s' ...", domain, row["domain"], row["software"])
                     domains.append({
                         "domain": domain,
                         "origin": row["domain"],
@@ -1921,7 +1921,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
                     logger.debug("domain='%s' already added", domain)
                     continue
 
-                logger.debug("Appending domain='%s',origin='%s',software='%s'", domain, row["domain"], row["software"])
+                logger.debug("Appending domain='%s',row[domain]='%s',row[software]='%s' ...", domain, row["domain"], row["software"])
                 domains.append({
                     "domain": domain,
                     "origin": row["domain"],