From 4c84e7a6e350f7ed3ef676ba054f44dbf26ec3ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 9 Dec 2023 08:03:01 +0100 Subject: [PATCH] Continued: - improved logger messages --- fba/commands.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fba/commands.py b/fba/commands.py index ef8ee42..de14596 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -565,7 +565,7 @@ def fetch_observer(args: argparse.Namespace) -> int: logger.debug("domain='%s' is already registered - SKIPPED!", domain) continue - logger.info("Fetching instances for domain='%s'", domain) + logger.info("Fetching instances for domain='%s' ...", domain) federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name) logger.debug("Success! - EXIT!") @@ -884,9 +884,11 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int: logger.debug("entry[]='%s'", type(entry)) doc = bs4.BeautifulSoup(entry.content.value, "html.parser") logger.debug("doc[]='%s'", type(doc)) + elements = doc.findAll("a") - for element in doc.findAll("a"): - logger.debug("element[]='%s'", type(element)) + logger.debug("Checking %d element(s) ...", len(elements)) + for element in elements: + logger.debug("element[%s]='%s'", type(element), element) for href in element["href"].split(","): logger.debug("href[%s]='%s' - BEFORE!", type(href), href) domain = tidyup.domain(href) if href not in [None, ""] else None @@ -986,11 +988,6 @@ def fetch_instances(args: argparse.Namespace) -> int: rows = database.cursor.fetchall() logger.info("Checking %d entries ...", len(rows)) for row in rows: - logger.debug("row[domain]='%s'", row["domain"]) - if row["domain"] == "": - logger.debug("row[domain] is empty - SKIPPED!") - continue - logger.debug("row[domain]='%s' - BEFORE!", row["domain"]) domain = row["domain"].encode("idna").decode("utf-8") logger.debug("domain='%s' - AFTER!", domain) -- 2.39.5