Merge pull request DedSecInside#263 from DedSecInside/add_logging

Adding logging

Author: KingAkeem

torbot/modules/api.py

@@ -6,6 +6,7 @@
 import requests
 
 from .utils import host, port
+from .log import info
 
 base_url: str = f'http://{host}:{port}'
 
@@ -16,8 +17,11 @@ def get_node(link: str, depth: int):
     """
     endpoint = f'/tree?link={link}&depth={depth}'
     url = base_url + endpoint
+    info(f'requesting {url}')
     resp = requests.get(url)
-    return resp.json()
+    data = resp.json()
+    info(f'retrieved {data}')
+    return data
 
 
 def get_ip():
@@ -26,7 +30,9 @@ def get_ip():
     """
     endpoint = '/ip'
     url = base_url + endpoint
+    info(f'requesting {url}')
     resp = requests.get(url)
+    info(f'retrieved {resp.text}')
     return resp.text
 
 
@@ -36,8 +42,11 @@ def get_emails(link: str):
     """
     endpoint = f'/emails?link={link}'
     url = base_url + endpoint
+    info(f'requesting {url}')
     resp = requests.get(url)
-    return resp.json()
+    data = resp.json()
+    info(f'retrieved {data}')
+    return data
 
 
 def get_phone(link: str):
@@ -46,8 +55,11 @@ def get_phone(link: str):
     """
     endpoint = f'/phone?link={link}'
     url = base_url + endpoint
+    info(f'requesting {url}')
     resp = requests.get(url)
-    return resp.json()
+    data = resp.json()
+    info(f'retrieved {data}')
+    return data
 
 
 def get_web_content(link: str):
@@ -56,5 +68,7 @@ def get_web_content(link: str):
     """
     endpoint = f'/content?link={link}'
     url = base_url + endpoint
+    info(f'requesting {url}')
     resp = requests.get(url)
+    info(f'retrieved {resp.text}')
     return resp.text

torbot/modules/linktree.py

@@ -1,10 +1,12 @@
 """
 Module is used for analyzing link relationships
 """
+
 from ete3 import Tree
 
 from .api import get_node
 from .utils import join_local_path
+from .log import info
 
 
 class LinkTree:
@@ -35,11 +37,13 @@ def __build_tree(self, url: str, depth: int=1):
         Returns:
             tree (ete3.Tree): Built tree.
         """
+        info(f"building tree for {url} at {depth}")
         root = get_node(url, depth)
         root_tree = Tree(name=root['url'])
         if root['children']:
             for child in root['children']:
                 self.__append_node(root_tree, child)
+        info(f"tree built {root_tree}")
         return root_tree
 
     def __len__(self):

torbot/modules/log.py

@@ -0,0 +1,8 @@
+import logging
+
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S')
+
+def info(msg: str):
+	logging.info(msg)
+