Continued:

[fba.git] / fetch_blocks.py

diff --git a/fetch_blocks.py b/fetch_blocks.py
index bb03061bdde2e2b6deb054f2aca4e188838aad3c..c12c26f742f691d5d33edcb93d7a570ff892666f 100755 (executable)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -138,7 +138,7 @@ for blocker, software, origin, nodeinfo_url in rows:
                                         "reason" : None
                                     })
                         else:
-                            print(f"DEBUG: Updating block last seen for blocker='{blocker}',blocked='{blocked}' ...")
+                            # DEBUG: print(f"DEBUG: Updating block last seen for blocker='{blocker}',blocked='{blocked}' ...")
                             fba.update_last_seen(blocker, blocked, block_level)
 
             # DEBUG: print("DEBUG: Committing changes ...")
@@ -331,11 +331,10 @@ for blocker, software, origin, nodeinfo_url in rows:
                         fba.block_instance(blocker, blocking, reason, block_level)
 
                         if block_level == "reject":
-                            blockdict.append(
-                                {
-                                    "blocked": blocked,
-                                    "reason" : reason
-                                })
+                            blockdict.append({
+                                "blocked": blocked,
+                                "reason" : reason
+                            })
                     else:
                         # DEBUG: print(f"DEBUG: Updating block last seen and reason for blocker='{blocker}',blocking='{blocking}' ...")
                         fba.update_last_seen(blocker, blocking, block_level)
@@ -429,13 +428,12 @@ for blocker, software, origin, nodeinfo_url in rows:
                         fba.block_instance(blocker, blocked, reason, block_level)
 
                         if block_level == "reject":
-                            blockdict.append(
-                                {
-                                    "blocked": blocked,
-                                    "reason" : reason
-                                })
+                            blockdict.append({
+                                "blocked": blocked,
+                                "reason" : reason
+                            })
                     else:
-                        print(f"DEBUG: Updating block last seen and reason for blocker='{blocker}',blocked='{blocked}' ...")
+                        # DEBUG: print(f"DEBUG: Updating block last seen and reason for blocker='{blocker}',blocked='{blocked}' ...")
                         fba.update_last_seen(blocker, blocked, block_level)
                         fba.update_block_reason(reason, blocker, blocked, block_level)
 
@@ -497,13 +495,12 @@ for blocker, software, origin, nodeinfo_url in rows:
                         # DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
                         fba.block_instance(blocker, blocked, "unknown", "reject")
 
-                        blockdict.append(
-                            {
-                                "blocked": blocked,
-                                "reason" : None
-                            })
+                        blockdict.append({
+                            "blocked": blocked,
+                            "reason" : None
+                        })
                     else:
-                        print(f"DEBUG: Updating block last seen for blocker='{blocker}',blocked='{blocked}' ...")
+                        # DEBUG: print(f"DEBUG: Updating block last seen for blocker='{blocker}',blocked='{blocked}' ...")
                         fba.update_last_seen(blocker, blocked, "reject")
 
                     if "public_comment" in peer: