Continued:

- log also domain,origin,blocker

diff --git a/fba/commands.py b/fba/commands.py
index 343579952a62a49e31e138b8d568f3d2beec2fe2..da46e6c752f21a3cc091cc37feaa2c1d0df0c319 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -214,7 +214,7 @@ def fetch_blocks(args: argparse.Namespace):
 
                         # DEBUG: print(f"DEBUG: row[]='{type(row)}'")
                         if row is None:
-                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}' - SKIPPED!")
+                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}',blocker='{blocker}',software='{software}' - SKIPPED!")
                             continue
 
                         blocked      = row[0]
@@ -226,7 +226,7 @@ def fetch_blocks(args: argparse.Namespace):
 
                         # DEBUG: print(f"DEBUG: row[]='{type(row)}'")
                         if row is None:
-                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}' - SKIPPED!")
+                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}',blocker='{blocker}',software='{software}' - SKIPPED!")
                             continue
 
                         blocked      = row[0]
@@ -235,7 +235,7 @@ def fetch_blocks(args: argparse.Namespace):
 
                     # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
                     if not validators.domain(blocked):
-                        print(f"WARNING: blocked='{blocked}',software='{software}' is not a valid domain name - skipped!")
+                        print(f"WARNING: blocked='{blocked}',software='{software}' is not a valid domain name - SKIPPED!")
                         continue
                     elif not instances.is_registered(blocked):
                         # DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
@@ -530,7 +530,7 @@ def fetch_oliphant(args: argparse.Namespace):
             # DEBUG: print(f"DEBUG: Skipping blocker='{block['blocker']}', not matching args.domain='{args.domain}'")
             continue
         elif domain in domains:
-            # DEBUG: print(f"DEBUG: domain='{domain}' already handled - skipped!")
+            # DEBUG: print(f"DEBUG: domain='{domain}' already handled - SKIPPED!")
             continue
 
         # Fetch this URL
@@ -592,7 +592,7 @@ def fetch_txt(args: argparse.Namespace):
 
                 # DEBUG: print(f"DEBUG: processed='{processed}'")
                 if not processed:
-                    # DEBUG: print(f"DEBUG: domain='{domain}' was not generically processed - skipped!")
+                    # DEBUG: print(f"DEBUG: domain='{domain}' was not generically processed - SKIPPED!")
                     continue
 
     # DEBUG: print("DEBUG: EXIT!")

diff --git a/fba/fba.py b/fba/fba.py
index e4224623c85a1e98239d3aa0edaa2e39c291321e..8eb5cd53277a0ceff094751726554c196be1180f 100644 (file)
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -127,7 +127,7 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
 
         # DEBUG: print(f"DEBUG: row[{type(row)}]='{row}'")
         if row is None:
-            print(f"WARNING: Cannot de-obfucate domain='{domain}' - skipped!")
+            print(f"WARNING: Cannot de-obfucate domain='{domain}' - SKIPPED!")
             return False
 
         # DEBUG: print(f"DEBUG: domain='{domain}' de-obscured to '{row[0]}'")
@@ -138,23 +138,23 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
 
         # DEBUG: print(f"DEBUG: row[{type(row)}]='{row}'")
         if row is None:
-            print(f"WARNING: Cannot de-obfucate domain='{domain}' - skipped!")
+            print(f"WARNING: Cannot de-obfucate domain='{domain}' - SKIPPED!")
             return False
 
         # DEBUG: print(f"DEBUG: domain='{domain}' de-obscured to '{row[0]}'")
         domain = row[0]
 
     if not validators.domain(domain):
-        print(f"WARNING: domain='{domain}' is not a valid domain - skipped!")
+        print(f"WARNING: domain='{domain}' is not a valid domain - SKIPPED!")
         return False
     elif domain.split(".")[-1] == "arpa":
         print(f"WARNING: domain='{domain}' is a reversed .arpa domain and should not be used generally.")
         return False
     elif blacklist.is_blacklisted(domain):
-        # DEBUG: print(f"DEBUG: domain='{domain}' is blacklisted - skipped!")
+        # DEBUG: print(f"DEBUG: domain='{domain}' is blacklisted - SKIPPED!")
         return False
     elif instances.is_recent(domain):
-        # DEBUG: print(f"DEBUG: domain='{domain}' has been recently checked - skipped!")
+        # DEBUG: print(f"DEBUG: domain='{domain}' has been recently checked - SKIPPED!")
         return False
 
     try:

diff --git a/fba/federation.py b/fba/federation.py
index 549f8a2ecb1c4a9664b2df9e7d7ecbb7ba35a97e..12f28688709dc382cbb6536977063ee30608c575 100644 (file)
--- a/fba/federation.py
+++ b/fba/federation.py
@@ -486,7 +486,7 @@ def find_domains(tag: bs4.element.Tag) -> list:
         # DEBUG: print(f"DEBUG: domain='{domain}',reason='{reason}'")
 
         if blacklist.is_blacklisted(domain):
-            print(f"WARNING: domain='{domain}' is blacklisted - skipped!")
+            print(f"WARNING: domain='{domain}' is blacklisted - SKIPPED!")
             continue
         elif domain == "gab.com/.ai, develop.gab.com":
             # DEBUG: print("DEBUG: Multiple domains detected in one row")
@@ -504,7 +504,7 @@ def find_domains(tag: bs4.element.Tag) -> list:
             })
             continue
         elif not validators.domain(domain):
-            print(f"WARNING: domain='{domain}' is not a valid domain - skipped!")
+            print(f"WARNING: domain='{domain}' is not a valid domain - SKIPPED!")
             continue
 
         # DEBUG: print(f"DEBUG: Adding domain='{domain}' ...")

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index ef580fb484f9b94b9e5af058bc93d03158ca65ad..03c5bd545e32a751890b72de78e7b93b4c4acb24 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -256,7 +256,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
                     if not validators.domain(blocked):
-                        print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - skipped!")
+                        print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - SKIPPED!")
                         continue
                     elif blocked.split(".")[-1] == "arpa":
                         print(f"WARNING: blocked='{blocked}' is a reversed .arpa domain and should not be used generally.")
@@ -265,12 +265,12 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                         # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., domain='{domain}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
                         instances.add(blocked, domain, inspect.currentframe().f_code.co_name, nodeinfo_url)
                 elif not validators.domain(blocked):
-                    print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - skipped!")
+                    print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - SKIPPED!")
                     continue
 
                 # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
                 if not validators.domain(blocked):
-                    print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - skipped!")
+                    print(f"WARNING: blocked='{blocked}',software='mastodon' is not a valid domain name - SKIPPED!")
                     continue
                 elif blocked.split(".")[-1] == "arpa":
                     print(f"WARNING: blocked='{blocked}' is a reversed .arpa domain and should not be used generally.")

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index be7a84089571146f60c7d89032cd7dc3b6e38b18..a216634e412013e01572091cf9027e78cff3e7bd 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -101,7 +101,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                         # DEBUG: print(f"DEBUG: row[]='{type(row)}'")
                         if row is None:
-                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}' - SKIPPED!")
+                            print(f"WARNING: Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
                             continue
 
                         # DEBUG: print(f"DEBUG: blocked='{blocked}' de-obscured to '{row[0]}'")
@@ -111,7 +111,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     # DEBUG: print(f"DEBUG: blocked='{blocked}'")
                     if not validators.domain(blocked):
-                        print(f"WARNING: blocked='{blocked}',software='pleroma' is not a valid domain name - skipped!")
+                        print(f"WARNING: blocked='{blocked}',software='pleroma' is not a valid domain name - SKIPPED!")
                         continue
                     elif blocked.split(".")[-1] == "arpa":
                         print(f"WARNING: blocked='{blocked}' is a reversed .arpa domain and should not be used generally.")
@@ -185,7 +185,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     # DEBUG: print(f"DEBUG: row[]='{type(row)}'")
                     if row is None:
-                        print(f"WARNING: Cannot deobsfucate blocked='{blocked}' - SKIPPED!")
+                        print(f"WARNING: Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
                         continue
 
                     # DEBUG: print(f"DEBUG: blocked='{blocked}' de-obscured to '{row[0]}'")
@@ -195,7 +195,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                 # DEBUG: print(f"DEBUG: blocked='{blocked}'")
                 if not validators.domain(blocked):
-                    print(f"WARNING: blocked='{blocked}',software='pleroma' is not a valid domain name - skipped!")
+                    print(f"WARNING: blocked='{blocked}',software='pleroma' is not a valid domain name - SKIPPED!")
                     continue
                 elif blocked.split(".")[-1] == "arpa":
                     print(f"WARNING: blocked='{blocked}' is a reversed .arpa domain and should not be used generally.")