Continued:

- don't continue with empty software name (empty string, not None type)

diff --git a/fba/commands.py b/fba/commands.py
index 499721521b95e89a5500425337372545a7453774..5b024765107e0462de1afe193ca41ba46da16b97 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -320,7 +320,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
         elif not args.force_all and instances.is_recent(row["domain"], "last_blocked"):
             logger.debug("row[domain]='%s' has recently been crawled - SKIPPED!", row["domain"])
             continue
-        elif row["software"] is None:
+        elif row["software"] in [None, ""]:
             logger.debug("row[domain]='%s' has no software set - SKIPPED!", row["domain"])
             continue
 
@@ -1049,6 +1049,7 @@ def fetch_instances(args: argparse.Namespace) -> int:
         rows = database.cursor.fetchall()
     else:
         # Loop through some instances
+        logger.debug("Querying database for peer sources ...")
         database.cursor.execute("SELECT domain, origin, software \
 FROM instances \
 WHERE software IN ( \
@@ -1065,7 +1066,7 @@ ORDER BY total_peers DESC, last_response_time ASC, last_updated ASC"
     logger.info("Checking %d entries ...", len(rows))
     for row in rows:
         logger.debug("row[domain]='%s',row[origin]='%s',row[software]='%s'", row["domain"], row["origin"], row["software"])
-        if row["software"] is None:
+        if row["software"] in [None, ""]:
             logger.warning("row[domain]='%s' has no software detected. You can try to run ./fba.py update_nodeinfo --domain=%s --force-all to get it updated - SKIPPED!", row["domain"], row["domain"])
             continue
         elif software_helper.is_relay(row["software"]):