From c5c5719bdd8292ed9a98031b0a7b8ef1087182f6 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Mon, 4 Mar 2024 13:26:55 +0545 Subject: [PATCH] Improve logger and filter condition --- API/api_worker.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/API/api_worker.py b/API/api_worker.py index 449042d0..841e3052 100644 --- a/API/api_worker.py +++ b/API/api_worker.py @@ -95,13 +95,16 @@ def zip_binding( logging.debug("Total %s to be zipped", humanize.naturalsize(inside_file_size)) system_ram = psutil.virtual_memory().total # system RAM in bytes - if inside_file_size < 0.8 * system_ram: # if less than 80% - logging.debug( - "System RAM : %s , Using default zipfile module for zipping", - humanize.naturalsize(system_ram), - ) + if ( + inside_file_size < 0.8 * system_ram and inside_file_size < 5 * 1024**3 + ): # if less than 80% or less than 5 gb + logging.debug("Using default zipfile module for zipping") with zipfile.ZipFile( - upload_file_path, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=8 + upload_file_path, + "w", + compression=zipfile.ZIP_DEFLATED, + compresslevel=9, + allowZip64=True, ) as zf: for file_path in pathlib.Path(working_dir).iterdir(): if file_path.is_file(): @@ -109,8 +112,7 @@ def zip_binding( else: logging.debug( - "System RAM %s is not enough for default zipfile approach hence falling to memory optimized zip", - humanize.naturalsize(system_ram), + "Using memory optimized zip", ) paths = [