Skip to content

Commit 6d36101

Browse files
committed
The verbose parameter is removed as deprecated
1 parent a704f09 commit 6d36101

1 file changed

Lines changed: 3 additions & 18 deletions

File tree

src/main.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self, src_ip, dst_domain, method):
3333

3434
class ProxyServer:
3535

36-
def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, auto_blacklist, quiet, verbose):
36+
def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, auto_blacklist, quiet):
3737

3838
self.host = host
3939
self.port = port
@@ -43,7 +43,6 @@ def __init__(self, host, port, blacklist, log_access, log_err, no_blacklist, aut
4343
self.no_blacklist = no_blacklist
4444
self.auto_blacklist = auto_blacklist
4545
self.quiet = quiet
46-
self.verbose = verbose
4746

4847
self.logger = logging.getLogger(__name__)
4948
self.logging_errors = None
@@ -363,9 +362,6 @@ async def handle_connection(self, reader, writer):
363362
host_err = "Unknown"
364363
self.logger.error(str(host_err.decode()) +
365364
": " + traceback.format_exc())
366-
if self.verbose:
367-
self.print(
368-
f"\033[93m[DEBUG]:\033[97m {host_err.decode()}: {e}\033[0m")
369365
writer.close()
370366

371367
async def pipe(self, reader, writer, direction, conn_key):
@@ -379,7 +375,8 @@ async def pipe(self, reader, writer, direction, conn_key):
379375
Parameters:
380376
reader (asyncio.StreamReader): The reader to read from
381377
writer (asyncio.StreamWriter): The writer to write to
382-
verbose (bool): Whether to print non-critical errors
378+
direction (str): The direction of the transfer (in or out)
379+
conn_key (tuple): The connection key
383380
"""
384381
try:
385382
while not reader.at_eof() and not writer.is_closing():
@@ -399,9 +396,6 @@ async def pipe(self, reader, writer, direction, conn_key):
399396
host_err = conn_info.dst_domain
400397
self.logger.error(str(host_err.decode()) +
401398
": " + traceback.format_exc())
402-
if self.verbose:
403-
self.print(
404-
f"\033[93m[DEBUG]:\033[97m {host_err.decode()}: {e}\033[0m")
405399
finally:
406400
writer.close()
407401
async with self.connections_lock:
@@ -431,8 +425,6 @@ async def fragment_data(self, reader, writer):
431425
data = await reader.read(2048)
432426
except Exception as e:
433427
self.logger.error(traceback.format_exc())
434-
if self.verbose:
435-
self.print(f"\033[93m[DEBUG]:\033[97m {e}\033[0m")
436428
return
437429

438430
if not self.no_blacklist and all(site not in data for site in self.blocked):
@@ -507,12 +499,6 @@ def parse_args():
507499
parser.add_argument(
508500
"-q", "--quiet", action="store_true", help="Remove UI output"
509501
)
510-
parser.add_argument(
511-
"-v",
512-
"--verbose",
513-
action="store_true",
514-
help="Show more info (only for devs)",
515-
)
516502

517503
autostart_group = parser.add_mutually_exclusive_group()
518504
autostart_group.add_argument(
@@ -597,7 +583,6 @@ async def run(cls):
597583
args.no_blacklist,
598584
args.autoblacklist,
599585
args.quiet,
600-
args.verbose,
601586
)
602587

603588
try:

0 commit comments

Comments
 (0)