Continued:

- rewrote logger messages from f-masked to lazy '%'
- added missing f(-masked)

diff --git a/fba/helpers/blacklist.py b/fba/helpers/blacklist.py
index 0a74eb1f6d8d0ba53a3855422f0cb001a299207d..06c066f6c7710389f7378ab9aed7a6069a12e31e 100644 (file)
--- a/fba/helpers/blacklist.py
+++ b/fba/helpers/blacklist.py
@@ -44,15 +44,16 @@ blacklist = [
 ]
 
 def is_blacklisted(domain: str) -> bool:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     blacklisted = False
+    logger.debug("Checking %d blacklist entries ...", len(blacklist))
     for peer in blacklist:
-        logger.debug(f"Checking peer='{peer}' ...")
+        logger.debug("Checking peer='%s' ...", peer)
         if peer in domain:
-            logger.debug(f"domain='{domain}' is blacklisted.")
+            logger.debug("domain='%s' is blacklisted.", domain)
             blacklisted = True
 
-    logger.debug(f"blacklisted='{blacklisted}' - EXIT!")
+    logger.debug("blacklisted='%s' - EXIT!", blacklisted)
     return blacklisted

diff --git a/fba/helpers/cache.py b/fba/helpers/cache.py
index a58d1731616f6eabcfb8cfef9d624293ec5ac196..05d3a809a64cb94666149e7390b3e6b30810e940 100644 (file)
--- a/fba/helpers/cache.py
+++ b/fba/helpers/cache.py
@@ -28,17 +28,17 @@ def key_exists(key: str) -> bool:
     return key in _cache
 
 def set_all(key: str, rows: list, value: any):
-    logger.debug(f"key='{key}',rows()={len(rows)},value[]='{type(value)}' - CALLED!")
+    logger.debug("key='%s',rows()=%d,value[]='%s' - CALLED!", key, len(rows), type(value))
     if not isinstance(key, str):
-        raise ValueError("Parameter key[]='{type(key)}' is not 'str'")
+        raise ValueError(f"Parameter key[]='{type(key)}' is not 'str'")
     elif not key_exists(key):
-        logger.debug(f"Cache for key='{key}' not initialized.")
-        _cache[key] = {}
+        logger.debug("Cache for key='%s' not initialized.", key)
+        _cache[key] = dict()
 
     for sub in rows:
-        logger.debug(f"Setting key='{key}',sub[{type(sub)}]='{sub}'")
+        logger.debug("Setting key='%s',sub[%s]='%s'", key, type(sub), sub)
         if isinstance(sub, tuple):
-            logger.debug(f"Setting key='{key}',sub[{type(sub)}]='{sub}',value[]='{type(value)}'")
+            logger.debug("Setting key='%s',sub[%s]='%s',value[]='%s'", key, type(sub), sub, type(value))
             _cache[key][sub[0]] = value
         else:
             logger.warning("Unsupported type sub[]='%s'", type(sub))
@@ -46,29 +46,29 @@ def set_all(key: str, rows: list, value: any):
     logger.debug("EXIT!")
 
 def set_sub_key(key: str, sub: str, value: any):
-    logger.debug(f"key='{key}',sub='{sub}',value[]='{type(value)}' - CALLED!")
+    logger.debug("key='%s',sub='%s',value[]='%s' - CALLED!", key, sub, type(value))
     if not isinstance(key, str):
-        raise ValueError("Parameter key[]='{type(key)}' is not 'str'")
+        raise ValueError(f"Parameter key[]='{type(key)}' is not 'str'")
     elif not isinstance(sub, str):
-        raise ValueError("Parameter sub[]='{type(sub)}' is not 'str'")
+        raise ValueError(f"Parameter sub[]='{type(sub)}' is not 'str'")
     elif not key_exists(key):
         raise Exception(f"Cache for key='{key}' is not initialized, but function invoked")
 
-    logger.debug(f"Setting key='{key}',sub='{sub}',value[]='{type(value)}' ...")
+    logger.debug("Setting key='%s',sub='%s',value[]='%s' ...", key, sub, type(value))
     _cache[key][sub] = value
 
     logger.debug("EXIT!")
 
 def sub_key_exists(key: str, sub: str) -> bool:
-    logger.debug(f"key='{key}',sub='{sub}' - CALLED!")
+    logger.debug("key='%s',sub='%s' - CALLED!", key, sub)
     if not isinstance(key, str):
-        raise ValueError("Parameter key[]='{type(key)}' is not 'str'")
+        raise ValueError(f"Parameter key[]='{type(key)}' is not 'str'")
     elif not isinstance(sub, str):
-        raise ValueError("Parameter sub[]='{type(sub)}' is not 'str'")
+        raise ValueError(f"Parameter sub[]='{type(sub)}' is not 'str'")
     elif not key_exists(key):
         raise Exception(f"Cache for key='{key}' is not initialized, but function invoked")
 
     exists = sub in _cache[key]
 
-    logger.debug(f"exists='{exists}' - EXIT!")
+    logger.debug("exists='%s' - EXIT!", exists)
     return exists

diff --git a/fba/helpers/config.py b/fba/helpers/config.py
index 3f199ba362223200d4888f95c52cb7949f33fcd0..ea78c46c71f0b00eb2d77023e2fbeea90411b3e1 100644 (file)
--- a/fba/helpers/config.py
+++ b/fba/helpers/config.py
@@ -25,7 +25,7 @@ with open("config.json") as f:
     _config = json.loads(f.read())
 
 def get(key: str) -> any:
-    logger.debug(f"key[{type(key)}]={key} - CALLED!")
+    logger.debug("key[%s]='%s' - CALLED!", type(key), key)
     if not isinstance(key, str):
         raise ValueError(f"Parameter key[]='{type(key)}' is not 'str'")
     elif key == "":
@@ -33,5 +33,5 @@ def get(key: str) -> any:
     elif not key in _config:
         raise KeyError(f"key='{key}' does not exist in _config array")
 
-    logger.debug(f"_config[{key}]={_config[key]} - EXIT!")
+    logger.debug("_config[%s][%s]='%s - EXIT!", key, type(_config[key]), _config[key])
     return _config[key]

diff --git a/fba/helpers/cookies.py b/fba/helpers/cookies.py
index c01294193ac1593e0b7171e3c2881381b7e1367b..09acd26e84072fe38130be1df157d3368466dacb 100644 (file)
--- a/fba/helpers/cookies.py
+++ b/fba/helpers/cookies.py
@@ -35,25 +35,26 @@ def store (domain: str, cookies: dict):
     logger.debug("EXIT!")
 
 def get_all(domain: str) -> dict:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
+
     if not has(domain):
         raise Exception(f"domain='{domain}' has no cookies stored, maybe invoke store() first?")
 
-    logger.debug(f"_cookies[{domain}]()={len(_cookies[domain])} - EXIT!")
+    logger.debug("_cookies[%s]()=%d - EXIT!", domain, len(_cookies[domain]))
     return _cookies[domain]
 
 def has (domain: str) -> bool:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     has_cookies = domain in _cookies
 
-    logger.debug(f"has_cookies='{has_cookies}' - EXIT!")
+    logger.debug("has_cookies='%s' - EXIT!", has_cookies)
     return has_cookies
 
 def clear (domain: str):
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     if has(domain):

diff --git a/fba/helpers/dicts.py b/fba/helpers/dicts.py
index 3ab744066be2aed8e88eab2b0275de6d9b188a5a..3f8a7e680463ecd0ffb3e9f6b481dd4e50d93165 100644 (file)
--- a/fba/helpers/dicts.py
+++ b/fba/helpers/dicts.py
@@ -19,7 +19,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def has_key(lists: list, key: str, value: any) -> bool:
-    logger.debug(f"lists()={len(lists)},key='{key}',value[]='{type(value)}' - CALLED!")
+    logger.debug("lists()=%d,key='%s',value[]='%s' - CALLED!", len(lists), key, type(value))
     if not isinstance(lists, list):
         raise ValueError(f"Parameter lists[]='{type(lists)}' is not 'list'")
     elif not isinstance(key, str):
@@ -28,16 +28,17 @@ def has_key(lists: list, key: str, value: any) -> bool:
         raise ValueError("Parameter 'key' is empty")
 
     has = False
-    logger.debug(f"Checking lists()={len(lists)} ...")
+    logger.debug("Checking lists()=%d ...", len(lists))
     for row in lists:
-        logger.debug(f"row['{type(row)}']={row}")
+        logger.debug("row[%s]='%s", type(row), row)
         if not isinstance(row, dict):
             raise ValueError(f"row[]='{type(row)}' is not 'dict'")
         elif not key in row:
             raise KeyError(f"Cannot find key='{key}'")
         elif row[key] == value:
+            logger.debug("row[%s][]='%s' matches value[]='%s'", key, type(row[key]), type(value))
             has = True
             break
 
-    logger.debug(f"has={has} - EXIT!")
+    logger.debug("has='%s' - EXIT!", has)
     return has

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 49ee0e16075732f82c00a3d502b1bdd7b6117305..f3b12c4446cecfef6b594ce9bd8133ea16ad0d94 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -261,7 +261,7 @@ def fetch_nodeinfo(domain: str, path: str = None) -> dict:
     return data
 
 def fetch_wellknown_nodeinfo(domain: str) -> dict:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     # No CSRF by default, you don't have to add network.api_headers by yourself here

diff --git a/fba/http/network.py b/fba/http/network.py
index 2ac9a4e5fa130fbdd6efd90295d7683147d6287f..c57f0a59a583e794365a5b252611a6a42c0e449d 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -73,13 +73,13 @@ def post_json_api(domain: str, path: str, data: str = "", headers: dict = dict()
     }
 
     try:
-        logger.debug(f"Sending POST to domain='{domain}',path='{path}',data='{data}',headers({len(headers)})={headers}")
+        logger.debug("Sending POST to domain='%s',path='%s',data='%s',headers(%d)='%s'", domain, path, data, len(headers), headers)
         response = reqto.post(
             f"https://{domain}{path}",
             data=data,
             headers={**api_headers, **headers},
             timeout=(config.get("connection_timeout"), config.get("read_timeout")),
-            cookies=cookies.get_all(domain) if cookies.has(domain) else {}
+            cookies=cookies.get_all(domain) if cookies.has(domain) else dict()
         )
 
         json_reply["json"] = json_from_response(response)
@@ -157,7 +157,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
     }
 
     try:
-        logger.debug(f"Sending GET to domain='{domain}',path='{path}',timeout({len(timeout)})={timeout}")
+        logger.debug("Sending GET to domain='%s',path='%s',timeout(%d)='%s'", domain, path, len(timeout), timeout)
         response = reqto.get(
             f"https://{domain}{path}",
             headers={**api_headers, **headers},
@@ -166,7 +166,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
         )
 
     except exceptions as exception:
-        logger.debug(f"Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+        logger.debug("Fetching path='%s' from domain='%s' failed. exception[%s]='%s'", path, domain, type(exception), str(exception))
         json_reply["status_code"]   = 999
         json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
         json_reply["exception"]     = exception

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 66fc29204497ffa8764a0cf65d6a620e41e89dab..c161799e2645dd46cb5d5662b4158f5c010c7f9f 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -82,7 +82,7 @@ def _set_data(key: str, domain: str, value: any):
     logger.debug("EXIT!")
 
 def has_pending(domain: str) -> bool:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     has = False
@@ -96,7 +96,7 @@ def has_pending(domain: str) -> bool:
     return has
 
 def update_data(domain: str):
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
     if not has_pending(domain):
         raise Exception(f"domain='{domain}' has no pending instance data, but function invoked")
@@ -209,7 +209,7 @@ def add(domain: str, origin: str, command: str, path: str = None, software: str
     logger.debug("EXIT!")
 
 def set_last_nodeinfo(domain: str):
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     logger.debug("Updating last_nodeinfo for domain='%s'", domain)
@@ -251,10 +251,10 @@ def set_last_error(domain: str, error: dict):
     logger.debug("EXIT!")
 
 def is_registered(domain: str) -> bool:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     if not cache.key_exists("is_registered"):
         logger.debug("Cache for 'is_registered' not initialized, fetching all rows ...")
         database.cursor.execute("SELECT domain FROM instances")
@@ -269,7 +269,7 @@ def is_registered(domain: str) -> bool:
     return registered
 
 def is_recent(domain: str) -> bool:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
     if not is_registered(domain):
         logger.debug(f"domain='{domain}' is not registered, returning False - EXIT!")
@@ -335,7 +335,7 @@ def deobfuscate(char: str, domain: str, blocked_hash: str = None) -> tuple:
     return row
 
 def set_last_blocked(domain: str):
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     # Set timestamp
@@ -343,7 +343,7 @@ def set_last_blocked(domain: str):
     logger.debug("EXIT!")
 
 def set_last_instance_fetch(domain: str):
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     # Set timestamp

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index c4a90c16b3413216aeb744cac6bf9e66aa4b12b8..2301fbfa8f7e91c87313d5039a40bd01ca0688f2 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
 #logger.setLevel(logging.DEBUG)
 
 def fetch_blocks(domain: str) -> list:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     blocklist = list()

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index c35716e2b9a139bd0b159543db414cc0a092cbbf..462b1a02f896983e718952ce028aee653270228a 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -34,7 +34,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def fetch_peers(domain: str) -> list:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     peers = list()

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index 962b2af7bdb14fe08b76276a2068fc47bf5dd78e..ff03314cfd14467a886bb08e32da1331bcbec920 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -59,7 +59,7 @@ language_mapping = {
 }
 
 def fetch_blocks_from_about(domain: str) -> dict:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     logger.debug("Fetching mastodon blocks from domain='%s'", domain)

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index 96436548b2c182425941fe446aafc686d09b4866..573b5252fcfdbc643731dc94e4d7ac8c87054850 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -32,7 +32,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def fetch_peers(domain: str) -> list:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     logger.debug("domain='%s' is misskey, sending API POST request ...", domain)
@@ -126,7 +126,7 @@ def fetch_peers(domain: str) -> list:
     return peers
 
 def fetch_blocks(domain: str) -> list:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     logger.debug("Fetching misskey blocks from domain='%s'", domain)

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index b0480e81099d98ff4c05697a73ee09210d5210cc..624f4133e97969399cd69832a951c2814c3c5752 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -205,7 +205,7 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                 blocked = row[0]
 
-            logger.debug("blocked='%s' - DEobfuscatED!", blocked)
+            logger.debug("blocked='%s' - DEOBFUSCATED!", blocked)
             if not utils.is_domain_wanted(blocked):
                 logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                 continue
@@ -300,7 +300,7 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                     blocked = row[0]
 
-                logger.debug("blocked='%s' - DEobfuscatED!", blocked)
+                logger.debug("blocked='%s' - DEOBFUSCATED!", blocked)
                 if not utils.is_domain_wanted(blocked):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
@@ -427,7 +427,7 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
                         logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
                         blocked = row[0]
 
-                    logger.debug("blocked='%s' - DEobfuscatED!", blocked)
+                    logger.debug("blocked='%s' - DEOBFUSCATED!", blocked)
                     if not utils.is_domain_wanted(blocked):
                         logger.warning("blocked='%s' is not wanted - SKIPPED!", blocked)
                         continue
@@ -444,7 +444,7 @@ def fetch_blocks(domain: str, nodeinfo_url: str) -> list:
     return blockdict
 
 def fetch_blocks_from_about(domain: str) -> dict:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     logger.debug("Fetching mastodon blocks from domain='%s'", domain)

diff --git a/fba/utils.py b/fba/utils.py
index 56d7116eaa8c9379c522e45640609e0284c34632..577e9ab4635c317cd06064985bc308570b73db9f 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -38,17 +38,17 @@ logger = logging.getLogger(__name__)
 ##### Other functions #####
 
 def is_primitive(var: any) -> bool:
-    logger.debug(f"var[]='{type(var)}' - CALLED!")
+    logger.debug("var[]='%s' - CALLED!", type(var))
     return type(var) in {int, str, float, bool} or var is None
 
 def get_hash(domain: str) -> str:
-    logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
+    logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
     return hashlib.sha256(domain.encode("utf-8")).hexdigest()
 
 def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Response:
-    logger.debug(f"url='{url}',headers()={len(headers)},timeout={timeout} - CALLED!")
+    logger.debug("url='%s',headers()=%d,timeout(%d)='%s' - CALLED!", url, len(headers), len(timeout), timeout)
     if not isinstance(url, str):
         raise ValueError(f"Parameter url[]='{type(url)}' is not 'str'")
     elif url == "":
@@ -58,21 +58,21 @@ def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Respon
     elif not isinstance(timeout, tuple):
         raise ValueError(f"Parameter timeout[]='{type(timeout)}' is not 'tuple'")
 
-    logger.debug(f"Parsing url='{url}'")
+    logger.debug("Parsing url='%s' ...", url)
     components = urlparse(url)
 
     # Invoke other function, avoid trailing ?
-    logger.debug(f"components[{type(components)}]={components}")
+    logger.debug("components[%s]='%s'", type(components), components)
     if components.query != "":
         response = network.fetch_response(components.netloc, f"{components.path}?{components.query}", headers, timeout)
     else:
         response = network.fetch_response(components.netloc, components.path if isinstance(components.path, str) and components.path != '' else '/', headers, timeout)
 
-    logger.debug(f"response[]='{type(response)}' - EXIT!")
+    logger.debug("response[]='%s' - EXIT!", type(response))
     return response
 
 def process_domain(domain: str, blocker: str, command: str) -> bool:
-    logger.debug(f"domain='{domain}',blocker='{blocker}',command='{command}' - CALLED!")
+    logger.debug("domain='%s',blocker='%s',command='%s' - CALLED!", domain, blocker, command)
     domain_helper.raise_on(domain)
     domain_helper.raise_on(blocker)
 
@@ -81,6 +81,7 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
     elif command == "":
         raise ValueError("Parameter 'command' is empty")
 
+    logger.debug("domain='%s' - BEFORE!")
     if domain.find("*") > 0:
         logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
         instances.set_has_obfuscation(blocker, True)
@@ -88,12 +89,12 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         # Try to de-obscure it
         row = instances.deobfuscate("*", domain)
 
-        logger.debug(f"row[{type(row)}]='{row}'")
+        logger.debug("row[%s]='%s'", type(row), row)
         if row is None:
             logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain)
             return False
 
-        logger.debug(f"domain='{domain}' de-obscured to '{row[0]}'")
+        logger.debug("domain='%s' de-obscured to '%s'", domain, row[0])
         domain = row[0]
     elif domain.find("?") > 0:
         logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker)
@@ -102,17 +103,18 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         # Try to de-obscure it
         row = instances.deobfuscate("?", domain)
 
-        logger.debug(f"row[{type(row)}]='{row}'")
+        logger.debug("row[%s]='%s'", type(row), row)
         if row is None:
             logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain)
             return False
 
-        logger.debug(f"domain='{domain}' de-obscured to '{row[0]}'")
+        logger.debug("domain='%s' de-obscured to '%s'", domain, row[0])
         domain = row[0]
     else:
         logger.debug("blocker='%s' has NO obfuscation on their block list", blocker)
         instances.set_has_obfuscation(blocker, False)
 
+    logger.debug("domain='%s' - DEOBFUSCATED!", domain)
     if instances.has_pending(blocker):
         logger.debug("Invoking instances.update_data(%s) ...", blocker)
         instances.update_data(blocker)
@@ -121,7 +123,7 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         logger.debug("domain='%s' is not wanted - SKIPPED!", domain)
         return False
     elif instances.is_recent(domain):
-        logger.debug(f"domain='{domain}' has been recently checked - SKIPPED!")
+        logger.debug("domain='%s' has been recently checked - SKIPPED!", domain)
         return False
 
     processed = False
@@ -136,7 +138,7 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         logger.warning("Exception '%s' during fetching instances (fetch_oliphant) from domain='%s'", type(exception), domain)
         instances.set_last_error(domain, exception)
 
-    logger.debug(f"processed='{processed}' - EXIT!")
+    logger.debug("processed='%s' - EXIT!", processed)
     return processed
 
 def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
@@ -149,6 +151,7 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
         raise ValueError("Parameter 'search' is empty")
 
     domains = list()
+    logger.debug("Parsing %d tags ...", len(tags))
     for tag in tags:
         logger.debug("tag[]='%s'", type(tag))
         domain = tidyup.domain(tag.find(search).contents[0])