From a6af3e67de01944749db9b11fb85198db25f08b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 30 May 2025 14:44:30 +0200 Subject: [PATCH] Continued: - changed warning to debug level - moved block_level upwards to avoid many function calls when empty level (warning) --- fba/commands.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/fba/commands.py b/fba/commands.py index fd5bc21..3f0c5d5 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -320,7 +320,7 @@ def fetch_blocks(args: argparse.Namespace) -> int: logger.debug("row[domain]='%s' has recently been crawled - SKIPPED!", row["domain"]) continue elif row["software"] is None: - logger.warning("row[domain]='%s' has no software set - SKIPPED!", row["domain"]) + logger.debug("row[domain]='%s' has no software set - SKIPPED!", row["domain"]) continue logger.debug("Setting last_blocked,has_obfuscation=false for row[domain]='%s' ...", row["domain"]) @@ -365,16 +365,20 @@ def fetch_blocks(args: argparse.Namespace) -> int: logger.info("Checking %d entries from row[domain]='%s',row[software]='%s' ...", len(blocking), row["domain"], row["software"]) for block in blocking: - logger.debug("blocked='%s',block_level='%s',reason='%s'", block["blocked"], block["block_level"], block["reason"]) + logger.debug("block[blocked]='%s',block[block_level]='%s',block[reason]='%s'", block["blocked"], block["block_level"], block["reason"]) if block["block_level"] in [None, ""]: logger.warning("block[block_level]='%s' is empty, row[domain]='%s',block[blocked]='%s'", block["block_level"], block["blocker"], block["blocked"]) continue + elif block["block_level"] in ["accept", "accepted"]: + logger.debug("block[blocked]='%s' is accepted, not wanted here - SKIPPED!", block["blocked"]) + continue - logger.debug("block[blocked]='%s',block[reason]='%s' - BEFORE!", block["blocked"], block["reason"]) - block["blocked"] = tidyup.domain(block["blocked"]) - block["reason"] = tidyup.reason(block["reason"]) if block["reason"] is not None and block["reason"] != "" else None - logger.debug("block[blocked]='%s',block[reason]='%s' - AFTER!", block["blocked"], block["reason"]) + logger.debug("block[blocked]='%s',block[reason]='%s',block[block_level]='%s' - BEFORE!", block["blocked"], block["reason"], block["block_level"]) + block["blocked"] = tidyup.domain(block["blocked"]) + block["reason"] = tidyup.reason(block["reason"]) if block["reason"] is not None and block["reason"] != "" else None + block["block_level"] = blocks_helper.alias_block_level(block["block_level"]) + logger.debug("block[blocked]='%s',block[reason]='%s',block[block_level]='%s' - AFFER!", block["blocked"], block["reason"], block["block_level"]) if block["blocked"] in [None, ""]: logger.warning("block[blocked]='%s' is empty, row[domain]='%s'", block["blocked"], row["domain"]) @@ -454,17 +458,10 @@ def fetch_blocks(args: argparse.Namespace) -> int: if not domain_helper.is_wanted(block["blocked"]): logger.debug("block[blocked]='%s' is not wanted - SKIPPED!", block["blocked"]) continue - elif block["block_level"] in ["accept", "accepted"]: - logger.debug("block[blocked]='%s' is accepted, not wanted here - SKIPPED!", block["blocked"]) - continue elif not instances.is_registered(block["blocked"]): logger.info("Fetching new instance block[blocked]'%s' for row[domain]='%s' ...", block["blocked"], row["domain"]) federation.fetch_instances(block["blocked"], row["domain"], None, inspect.currentframe().f_code.co_name) - logger.debug("Invoking blocks_helper.alias_block_level('%s') ... - BEFORE!", block["block_level"]) - block["block_level"] = blocks_helper.alias_block_level(block["block_level"]) - logger.debug("block[block_level]='%s' - AFTER!", block["block_level"]) - if processing.block(row["domain"], block["blocked"], block["reason"], block["block_level"]) and block["block_level"] in ["rejected", "suspended"] and _bot_enabled: logger.debug("Appending block[blocked]'%s',reason='%s' for row[domain]='%s' ...", block["blocked"], block["block_level"], row["domain"]) blockdict.append({ -- 2.39.5