@@ -50,16 +50,10 @@ def __init__(
5050 self .timeout = timeout
5151 self .max_retries = max_retries
5252 self .semaphore = asyncio .Semaphore (max_concurrent_queries )
53- # self.progress_callback: Optional[Callable[[], None]] = None
5453 self .progress_callback : Optional [Callable [[int , int ], None ]] = None
5554 self .query_counter = 0 # New
5655 self .total_queries = 0 # New
5756
58- # def set_progress_callback(self, callback: Callable[[], None]) -> None:
59- # """Set callback for progress updates."""
60- # self.progress_callback = callback
61- # return None
62-
6357 def set_progress_callback (self , callback : Callable [[int , int ], None ]) -> None :
6458 """Set callback for progress updates with completed/total counts."""
6559 self .progress_callback = callback
@@ -91,23 +85,6 @@ async def query_single(
9185 else []
9286 )
9387 ttl = response .rrset .ttl if response .rrset else None
94-
95- # Update progress
96- # if self.progress_callback:
97- # self.progress_callback()
98-
99- # return DNSQueryResult(
100- # resolver_ip=resolver_ip,
101- # resolver_name=resolver_name,
102- # domain=domain,
103- # record_type=record_type,
104- # start_time=start_time,
105- # end_time=end_time,
106- # latency_ms=latency_ms,
107- # status=QueryStatus.SUCCESS,
108- # answers=answers,
109- # ttl=ttl,
110- # )
11188 result = DNSQueryResult (
11289 resolver_ip = resolver_ip ,
11390 resolver_name = resolver_name ,
@@ -123,14 +100,10 @@ async def query_single(
123100 if self .progress_callback :
124101 self .query_counter += 1
125102 self .progress_callback (self .query_counter , self .total_queries )
126-
127103 return result
128-
129104 except dns .exception .Timeout :
130105 if attempt == self .max_retries :
131106 end_time = time .time ()
132- # if self.progress_callback:
133- # self.progress_callback()
134107 if self .progress_callback :
135108 self .query_counter += 1
136109 self .progress_callback (self .query_counter , self .total_queries )
@@ -148,11 +121,8 @@ async def query_single(
148121 error_message = "Query timeout" ,
149122 )
150123 await asyncio .sleep (2 ** attempt )
151-
152124 except dns .resolver .NXDOMAIN :
153125 end_time = time .time ()
154- # if self.progress_callback:
155- # self.progress_callback()
156126 if self .progress_callback :
157127 self .query_counter += 1
158128 self .progress_callback (self .query_counter , self .total_queries )
@@ -169,11 +139,8 @@ async def query_single(
169139 ttl = None ,
170140 error_message = "Non-existent domain" ,
171141 )
172-
173142 except dns .resolver .NoNameservers :
174143 end_time = time .time ()
175- # if self.progress_callback:
176- # self.progress_callback()
177144 if self .progress_callback :
178145 self .query_counter += 1
179146 self .progress_callback (self .query_counter , self .total_queries )
@@ -190,16 +157,12 @@ async def query_single(
190157 ttl = None ,
191158 error_message = "Server failure" ,
192159 )
193-
194160 except Exception as e :
195161 if attempt == self .max_retries :
196162 end_time = time .time ()
197163 error_status = QueryStatus .UNKNOWN_ERROR
198164 if "refused" in str (e ).lower ():
199165 error_status = QueryStatus .CONNECTION_REFUSED
200-
201- # if self.progress_callback:
202- # self.progress_callback()
203166 if self .progress_callback :
204167 self .query_counter += 1
205168 self .progress_callback (self .query_counter , self .total_queries )
@@ -250,17 +213,6 @@ async def run_benchmark(
250213 )
251214
252215 tasks = []
253- # for resolver in resolvers:
254- # for domain in domains:
255- # for record_type in record_types:
256- # task = self.query_single(
257- # resolver_ip=resolver["ip"],
258- # resolver_name=resolver["name"],
259- # domain=domain,
260- # record_type=record_type,
261- # )
262- # tasks.append(task)
263-
264216 for iteration in range (iterations ):
265217 for resolver in resolvers :
266218 for domain in domains :
0 commit comments