From 1a537154faa424de85dba3890996a87ebbe9d6f7 Mon Sep 17 00:00:00 2001
From: Andrevich <47223721+1andrevich@users.noreply.github.com>
Date: Sat, 7 Dec 2024 19:51:12 +0400
Subject: [PATCH] Update resolver_ooni.py

---
 src/step 5 ooni list/resolver_ooni.py | 49 +++++++--------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/src/step 5 ooni list/resolver_ooni.py b/src/step 5 ooni list/resolver_ooni.py
index 2b9f164..2662396 100644
--- a/src/step 5 ooni list/resolver_ooni.py	
+++ b/src/step 5 ooni list/resolver_ooni.py	
@@ -1,5 +1,4 @@
 import socket
-import logging
 import concurrent.futures
 import threading
 import gc
@@ -9,44 +8,27 @@ import ipaddress
 from idna import encode as idna_encode
 from queue import Queue
 
-# Set up logging
-logging.basicConfig(level=logging.DEBUG,  # Set the lowest level to capture all logs
-                    format="%(asctime)s - %(levelname)s - %(message)s",
-                    handlers=[
-                        logging.FileHandler("general_ooni.log", mode='a'),
-                        logging.StreamHandler()  # This will print logs to console as well
-                    ])
-
-# Additional error logging handler
-error_logger = logging.getLogger("error")
-error_handler = logging.FileHandler("error_ooni.log", mode='a')
-error_handler.setLevel(logging.ERROR)
-error_logger.addHandler(error_handler)
-
 # Lock for writing to the output file in a thread-safe way
 file_write_lock = threading.Lock()
 
 # Queue to hold results for batch writing
 results_queue = Queue()
 
-
 # Function to resolve a domain with retries and punycode support
 def resolve_domain(domain, max_retries=2):
     ip_set = set()
     # Convert to punycode if necessary
     try:
         domain = idna_encode(domain).decode('utf-8')
-    except Exception as e:
-        error_logger.error(f"Punycode conversion failed for domain {domain}: {e}")
+    except Exception:
         return []
 
     for _ in range(max_retries):
         try:
             ip_list = socket.gethostbyname_ex(domain)[2]
             ip_set.update(ip_list)
-            logging.info(f"Resolved {domain} to IPs: {ip_list}")
-        except socket.gaierror as e:
-            error_logger.error(f"Could not resolve domain {domain}: {e}")
+        except socket.gaierror:
+            pass
     return list(ip_set)
 
 # Function to check if IP is already covered by an existing CIDR
@@ -56,8 +38,8 @@ def is_ip_in_existing_cidr(ip, cidrs):
         for cidr in cidrs:
             if ip_obj in ipaddress.ip_network(cidr, strict=False):
                 return True
-    except ValueError as e:
-        error_logger.error(f"Invalid IP or CIDR: {ip} - {cidr}: {e}")
+    except ValueError:
+        pass
     return False
 
 # Function to get all CIDRs for a domain by resolving its IP addresses
@@ -69,19 +51,16 @@ def process_domain(domain, existing_cidrs):
             if not is_ip_in_existing_cidr(ip, existing_cidrs):
                 cidrs.add(f"{ip}/32")
         return cidrs
-    except Exception as e:
-        error_logger.error(f"Error processing domain {domain}: {e}")
+    except Exception:
         return set()
 
 # Function to read domains from domains.lst file
-def read_domains_from_file(file_path="input/ooni_domains.lst"):
+def read_domains_from_file(file_path="sum/input/ooni_domains.lst"):
     try:
         with open(file_path, 'r', encoding='utf-8') as f:
             domains = [line.strip() for line in f.readlines() if line.strip()]
-        logging.info(f"Read {len(domains)} domains from file.")
         return domains
-    except FileNotFoundError as e:
-        error_logger.error(f"File not found: {file_path}, {e}")
+    except FileNotFoundError:
         return []
 
 # Function to write CIDRs in batches to output file in a thread-safe way
@@ -94,7 +73,6 @@ def write_cidrs_to_file(filename="ooni_ips_temp.lst"):
             with open(filename, 'a', encoding='utf-8') as f:
                 for cidr in cidrs:
                     f.write(f"{cidr}\n")
-            logging.info(f"Written {len(cidrs)} CIDRs to {filename}")
         results_queue.task_done()
 
 # Multithreading to handle large domain lists efficiently
@@ -103,19 +81,18 @@ def main():
     gc.enable()
 
     # Read the domains from domains.lst file
-    domains = read_domains_from_file("input/ooni_domains.lst")
+    domains = read_domains_from_file("sum/input/ooni_domains.lst")
     if not domains:
-        logging.info("No domains to process.")
         return
 
     existing_cidrs = set()  # Keep track of all CIDRs to exclude matching IPs
 
     # Start the file writer thread
-    writer_thread = threading.Thread(target=write_cidrs_to_file, args=("input/ooni_ips.lst",))
+    writer_thread = threading.Thread(target=write_cidrs_to_file, args=("sum/input/ooni_ips.lst",))
     writer_thread.start()
 
     # Use ThreadPoolExecutor to use more threads (set to 16 threads for better utilization)
-    with concurrent.futures.ThreadPoolExecutor(max_workers=35) as executor:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=8) as executor:
         future_to_domain = {executor.submit(process_domain, domain, existing_cidrs): domain for domain in domains}
 
         for future in concurrent.futures.as_completed(future_to_domain):
@@ -124,8 +101,8 @@ def main():
                 domain_cidrs = future.result()
                 if domain_cidrs:
                     results_queue.put(domain_cidrs)
-            except Exception as e:
-                error_logger.error(f"Error with domain {domain}: {e}")
+            except Exception:
+                pass
             finally:
                 # Collect garbage after each domain processing to free memory
                 gc.collect()