Index: cloudsync/handlers/ui_cs_request_handler.py =================================================================== diff -u -r6c122c0fa1daac67f03da7b8826305d463bfefd9 -rc88f546ad09c2d6c0222d8e694a9814e37a424ea --- cloudsync/handlers/ui_cs_request_handler.py (.../ui_cs_request_handler.py) (revision 6c122c0fa1daac67f03da7b8826305d463bfefd9) +++ cloudsync/handlers/ui_cs_request_handler.py (.../ui_cs_request_handler.py) (revision c88f546ad09c2d6c0222d8e694a9814e37a424ea) @@ -235,10 +235,10 @@ # CS LOG ROTATION elif InboundMessageIDs.mapped_str_value(message.ID) == InboundMessageIDs.UI2CS_REQ_LOG_ROTATION: self.logger.info("UI2CS_REQ_LOG_ROTATION request received") - if len(message.parameters) != 1 and message.parameters[0] > 0: + if len(message.parameters) == 1 and int(message.parameters[0]) > 0: try: self.logger.debug("Used Percentage: {0}".format(message.parameters[0])) - num_of_files, del_size_mb = helpers_log_rotation(message.parameters[0]) + num_of_files, del_size_mb = helpers_log_rotation(int(message.parameters[0])) message_body = str( OutboundMessageIDs.CS2UI_REQ_LOG_ROTATION.value) + f',{num_of_files}' + f',{del_size_mb}' self.output_channel.enqueue_message(message_body) Index: cloudsync/utils/helpers.py =================================================================== diff -u -r6c122c0fa1daac67f03da7b8826305d463bfefd9 -rc88f546ad09c2d6c0222d8e694a9814e37a424ea --- cloudsync/utils/helpers.py (.../helpers.py) (revision 6c122c0fa1daac67f03da7b8826305d463bfefd9) +++ cloudsync/utils/helpers.py (.../helpers.py) (revision c88f546ad09c2d6c0222d8e694a9814e37a424ea) @@ -752,8 +752,8 @@ # Total sd stats sd_total_bytes, sd_used_bytes, sd_free_bytes = shutil.disk_usage(UI2CS_FILE_CHANNELS_PATH) - if sd_used_bytes == 0: - sd_used_bytes = 1 + if sd_total_bytes == 0: + sd_total_bytes = 1 # Cloudsync log stats used_bytes_proc_call = subprocess.check_output(['du', '-bsx', UI2CS_FILE_CHANNELS_PATH]).split() if len(used_bytes_proc_call) > 0: @@ -770,7 +770,7 @@ f.sort(key=lambda x: os.path.getmtime(x)) if len(f) > 1: - while (cs_used_bytes / sd_used_bytes) <= cs_log_pct: + while (cs_used_bytes / sd_total_bytes) >= cs_log_pct and len(f) > 1: file_to_remove = f[0] os.remove(file_to_remove) num_files_deleted += 1