@@ -328,9 +328,15 @@ async def handle_connection(self, reader, writer):
328328 await writer .drain ()
329329 except Exception :
330330 pass
331- self .logger .error (traceback .format_exc ())
331+ try :
332+ host_err = host
333+ except Exception :
334+ host_err = "Unknown"
335+ self .logger .error (str (host_err .decode ()) +
336+ ": " + traceback .format_exc ())
332337 if self .verbose :
333- self .print (f"\033 [93m[NON-CRITICAL]:\033 [97m { e } \033 [0m" )
338+ self .print (
339+ f"\033 [93m[DEBUG]:\033 [97m { host_err .decode ()} : { e } \033 [0m" )
334340 writer .close ()
335341
336342 async def pipe (self , reader , writer , direction , conn_key ):
@@ -361,17 +367,21 @@ async def pipe(self, reader, writer, direction, conn_key):
361367 writer .write (data )
362368 await writer .drain ()
363369 except Exception as e :
364- self .logger .error (traceback .format_exc ())
370+ host_err = conn_info .dst_domain
371+ self .logger .error (str (host_err .decode ()) +
372+ ": " + traceback .format_exc ())
365373 if self .verbose :
366- self .print (f"\033 [93m[NON-CRITICAL]:\033 [97m { e } \033 [0m" )
374+ self .print (
375+ f"\033 [93m[DEBUG]:\033 [97m { host_err .decode ()} : { e } \033 [0m" )
367376 finally :
368377 writer .close ()
369378 async with self .connections_lock :
370379 conn_info : ConnectionInfo = self .active_connections .pop (
371380 conn_key , None )
372381 if conn_info :
373382 self .logger .info (
374- f"{ conn_info .start_time } { conn_info .src_ip } { conn_info .method } { conn_info .dst_domain } "
383+ "%s %s %s %s" ,
384+ conn_info .start_time , conn_info .src_ip , conn_info .method , conn_info .dst_domain
375385 )
376386
377387 async def fragment_data (self , reader , writer ):
@@ -393,7 +403,7 @@ async def fragment_data(self, reader, writer):
393403 except Exception as e :
394404 self .logger .error (traceback .format_exc ())
395405 if self .verbose :
396- self .print (f"\033 [93m[NON-CRITICAL ]:\033 [97m { e } \033 [0m" )
406+ self .print (f"\033 [93m[DEBUG ]:\033 [97m { e } \033 [0m" )
397407 return
398408
399409 if not self .no_blacklist and all (site not in data for site in self .blocked ):
0 commit comments