Continued:

- rewrote more logging messages from f-masked to lazy '%'

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 5ac5cfccb768a5ad695e67569999329f46f7bd55..cd5426c387b85109f42b41d0d72b6de9827a3207 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -84,11 +84,11 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     logger.debug(f"Updating last_instance_fetch for domain='{domain}' ...")
     instances.set_last_instance_fetch(domain)
 
-    logger.debug("Fetching instances for domain:", domain, software)
+    logger.debug("Fetching instances for domain='%s',software='%s'", domain, software)
     peerlist = fetch_peers(domain, software)
 
     if peerlist is None:
-        logger.warning("Cannot fetch peers:", domain)
+        logger.warning("Cannot fetch peers: domain='%s'", domain)
         return
     elif instances.has_pending(domain):
         logger.debug(f"domain='{domain}' has pending nodeinfo data, flushing ...")
@@ -250,7 +250,7 @@ def fetch_nodeinfo(domain: str, path: str = None) -> dict:
 
             logger.debug("data[]='%s'", type(data))
             if "error_message" not in data:
-                logger.debug("Success:", request)
+                logger.debug("Success: request='%s'", request)
                 instances.set_detection_mode(domain, "STATIC_CHECK")
                 instances.set_nodeinfo_url(domain, request)
                 break
@@ -279,7 +279,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
             "exception"    : exception,
         }
 
-    logger.debug("Fetching .well-known info for domain:", domain)
+    logger.debug("Fetching .well-known info for domain='%s'", domain)
     data = network.get_json_api(
         domain,
         "/.well-known/nodeinfo",
@@ -311,7 +311,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
                         logger.debug("components.netloc='%s' is not wanted - SKIPPED!", components.netloc)
                         continue
 
-                    logger.debug("Fetching nodeinfo from:", url)
+                    logger.debug("Fetching nodeinfo from url='%s' ...", url)
                     data = network.fetch_api_url(
                         url,
                         (config.get("connection_timeout"), config.get("read_timeout"))
@@ -367,7 +367,7 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
                 logger.info("domain='%s' is generated by '%s'", domain, software)
                 instances.set_detection_mode(domain, "GENERATOR")
         elif isinstance(site_name, bs4.element.Tag) and isinstance(site_name.get("content"), str):
-            logger.debug("Found property=og:site_name:", domain)
+            logger.debug("Found property=og:site_name, domain='%s'", domain)
             software = tidyup.domain(site_name.get("content"))
 
             logger.debug("software[%s]='%s'", type(software), software)
@@ -407,7 +407,7 @@ def determine_software(domain: str, path: str = None) -> str:
     if not isinstance(path, str) and path is not None:
         raise ValueError(f"Parameter path[]='{type(path)}' is not 'str'")
 
-    logger.debug("Determining software for domain,path:", domain, path)
+    logger.debug("Determining software for domain='%s',path='%s'", domain, path)
     software = None
 
     logger.debug("Fetching nodeinfo from domain='%s' ...", domain)

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 17c2018ef0354655583e1c55b9419d66c6ebc730..12f5f044b58fcb07729e99b286d79d406a9be04c 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -210,7 +210,7 @@ def set_last_nodeinfo(domain: str):
     logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
     domain_helper.raise_on(domain)
 
-    logger.debug("Updating last_nodeinfo for domain:", domain)
+    logger.debug("Updating last_nodeinfo for domain='%s'", domain)
     _set_data("last_nodeinfo", domain, time.time())
 
     # Running pending updated

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 0af8a5baaa1534627305596f7151804c49621d9b..a5d123c27e6f387395814ec1305c549ac4d79583 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -39,7 +39,7 @@ def fetch_blocks(domain: str) -> dict:
     block_tag = None
 
     try:
-        logger.debug("Fetching friendica blocks from domain:", domain)
+        logger.debug("Fetching friendica blocks from domain='%s'", domain)
         doc = bs4.BeautifulSoup(
             network.fetch_response(
                 domain,
@@ -59,7 +59,7 @@ def fetch_blocks(domain: str) -> dict:
 
     # Prevents exceptions:
     if block_tag is None:
-        logger.debug("Instance has no block list:", domain)
+        logger.debug("Instance has no block list: domain='%s'", domain)
         return dict()
 
     table = block_tag.find("table")

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 7c57b44c87735e97f577d779539cebbb2055d91b..580608045aaa087f9714e7282672051108d847db 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -163,7 +163,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
             logger.debug(f"found[]='{type(found)}'")
             if found is None:
-                logger.debug(f"domain='{domain}' is not blocking any instances - EXIT!")
+                logger.debug("domain='%s' is not blocking any instances - EXIT!", domain)
                 return
 
             blocking = found.find_next("ul").findAll("a")
@@ -177,11 +177,11 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
                 elif not instances.is_registered(blocked):
-                    logger.debug("Hash wasn't found, adding:", blocked, domain)
+                    logger.debug("Hash wasn't found, adding: blocked='%s',domain='%s'", blocked, domain)
                     instances.add(blocked, domain, inspect.currentframe().f_code.co_name, nodeinfo_url)
 
                 if not blocks.is_instance_blocked(domain, blocked, "reject"):
-                    logger.debug("Blocking:", domain, blocked)
+                    logger.debug("Blocking: domain='%s',blocked='%s' (reject)", domain, blocked)
                     blocks.add_instance(domain, blocked, None, "reject")
 
                     found_blocks.append({

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index ad3e913aa3c467f0bbcf3bfb26f9aa168ca34dde..4c92c1e495e94f8098d2752393ca4f00444781fa 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -67,7 +67,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
     logger.debug("domain(%d)='%s' - CALLED!", len(domain), domain)
     domain_helper.raise_on(domain)
 
-    logger.debug("Fetching mastodon blocks from domain:", domain)
+    logger.debug("Fetching mastodon blocks from domain='%s'", domain)
     doc = None
     for path in ["/about/more", "/about"]:
         try:

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index cd1097ab00e1da5438f3fefadf78a78f92c322c3..c18ef32c521ee17fc3a835e19edd2c76f4af6a4d 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -156,7 +156,7 @@ def fetch_blocks(domain: str) -> dict:
         try:
             logger.debug("Fetching offset='%d' from domain='%s' ...", offset, domain)
             if offset == 0:
-                logger.debug("Sending JSON API request to domain,step,offset:", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,
@@ -164,7 +164,7 @@ def fetch_blocks(domain: str) -> dict:
                     "limit"    : step
                 }), headers)
             else:
-                logger.debug("Sending JSON API request to domain,step,offset:", domain, step, offset)
+                logger.debug("Sending JSON API request to domain='%s',step='%d',offset='%d'", domain, step, offset)
                 fetched = network.post_json_api(domain, "/api/federation/instances", json.dumps({
                     "sort"     : "+pubAt",
                     "host"     : None,

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 390b01e064c0f93bfe7195a39f779a57922c89c0..1f38e358b987a49253ea1040e4de15291d1cccb1 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -65,7 +65,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
         instances.set_last_error(domain, exception)
 
     if rows is None:
-        logger.warning("Could not fetch nodeinfo from domain:", domain)
+        logger.warning("Could not fetch nodeinfo from domain='%s'", domain)
         return
     elif "metadata" not in rows:
         logger.warning("rows()=%d does not have key 'metadata', domain='%s'", len(rows), domain)
@@ -79,7 +79,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
     logger.debug("data[]='%s'", type(data))
     if "mrf_simple" in data:
-        logger.debug("Found mrf_simple:", domain)
+        logger.debug("Found mrf_simple in API response from domain='%s'", domain)
         found = True
         for block_level, blocklist in (
             {
@@ -108,7 +108,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                     logger.debug("blocked='%s' - AFTER!", blocked)
 
                     if blocked == "":
-                        logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
+                        logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                         continue
                     elif blocked.endswith(".arpa"):
                         logger.debug("blocked='%s' is a reverse IP address - SKIPPED!", blocked)
@@ -179,7 +179,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
             logger.debug("blocked='%s' - AFTER!", blocked)
 
             if blocked == "":
-                logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
+                logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif blocked.endswith(".arpa"):
                 logger.debug("blocked='%s' is a reverse IP address - SKIPPED!", blocked)
@@ -284,7 +284,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                 logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
                 if blocked == "":
-                    logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
+                    logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                     continue
                 elif blocked.count("*") > 0:
                     # Obscured domain name with no hash
@@ -350,7 +350,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
             logger.debug("reason='%s'", reason)
 
             if blocked == "":
-                logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
+                logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                 continue
             elif blocked.count("*") > 0:
                 # Obscured domain name with no hash
@@ -417,7 +417,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                     logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
                     if blocked == "":
-                        logger.warning("blocked is empty after tidyup.domain():", domain, block_level)
+                        logger.warning("blocked is empty after tidyup.domain(): domain='%s',block_level='%s'", domain, block_level)
                         continue
                     elif blocked.count("*") > 0:
                         # Obscured domain name with no hash
@@ -509,7 +509,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
                 break
 
         except network.exceptions as exception:
-            logger.warning("Cannot fetch from domain:", domain, exception)
+            logger.warning("Cannot fetch from domain='%s',exception[%s]='%s'", domain, type(exception), str(exception))
             instances.set_last_error(domain, exception)
             break