Add timeout and site content logging

2 files changed, 7 insertions, 3 deletions

diff --git a/term.py b/term.py
index ceb07fa..3954885 100644
--- a/term.py
+++ b/term.py
@@ -54,11 +54,14 @@ class Term:
     def newln(): Term.write("\n")
 
     @staticmethod
-    def log(logmsg: str):
+    def log(logmsg: str, display=True):
         logmsg = str(logmsg)
         with Term._print_lock:
             Term._logfile.write(logmsg + "\n")
             Term._logfile.flush()
+            if not display:
+                return
+
             Term.mov_ls()
             if Term._process_name is not None:
                 Term.write("    ")
diff --git a/tor-site-tester.py b/tor-site-tester.py
index 7ce28ed..1020d3d 100644
--- a/tor-site-tester.py
+++ b/tor-site-tester.py
@@ -120,9 +120,10 @@ def do_request(url, proxies=None):
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; rv:104.0) Gecko/20100101 Firefox/104.0",
     }
     try:
-        res = requests.get(url, proxies=proxies, headers=headers)
+        res = requests.get(url, proxies=proxies, headers=headers, timeout=120)
+        Term.log(str(res.text), display=False)
         return (res.status_code, perf_counter() - t1)
-    except requests.ConnectionError as e:
+    except (requests.ReadTimeout, requests.ConnectionError) as e:
         return (e, perf_counter() - t1)