Continued:

- output fetched rows so it is clear it might take some time to finish

diff --git a/fetch_blocks.py b/fetch_blocks.py
index a5aa9ea76e014e462c36dacd9875803e9d436049..7d4ce24c2135de007af65561f4d4954e2e24b581 100644 (file)
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -9,7 +9,9 @@ fba.cursor.execute(
     "SELECT domain, software FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial', 'bookwyrm', 'takahe') AND (last_blocked IS NULL OR last_blocked < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_block"]]
 )
 
-for blocker, software in fba.cursor.fetchall():
+rows = fba.cursor.fetchall()
+print(f"INFO: Checking {len(rows)} entries ...")
+for blocker, software in rows:
     # NOISY-DEBUG: print("DEBUG: BEFORE blocker,software:", blocker, software)
     blockdict = []
     blocker = fba.tidyup(blocker)

diff --git a/fetch_instances.py b/fetch_instances.py
index 6b8a8d81f27af6b13f3554950e4a2693cd6eea09..9aebc35f94f619f995d27016135c7556cbd8caef 100644 (file)
--- a/fetch_instances.py
+++ b/fetch_instances.py
@@ -67,7 +67,9 @@ fba.cursor.execute(
     "SELECT domain,software FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'gotosocial', 'bookwyrm', 'takahe', 'lemmy') AND (last_nodeinfo IS NULL OR last_nodeinfo < ?) ORDER BY rowid DESC", [time.time() - fba.config["recheck_instance"]]
 )
 
-for row in fba.cursor.fetchall():
+rows = fba.cursor.fetchall()
+print(f"INFO: Checking {len(rows)} entries ...")
+for row in rows:
     # NOISY-DEBUG: print("DEBUG: domain:", row[0])
     if fba.is_blacklisted(row[0]):
         print("WARNING: domain is blacklisted:", row[0])