Index: cloudsync/utils/helpers.py =================================================================== diff -u -rdea56f2966d1495d5847aa19d415a2ac00116931 -ra99a66106acb0e6780e688f27a42fb9038d8f8f9 --- cloudsync/utils/helpers.py (.../helpers.py) (revision dea56f2966d1495d5847aa19d415a2ac00116931) +++ cloudsync/utils/helpers.py (.../helpers.py) (revision a99a66106acb0e6780e688f27a42fb9038d8f8f9) @@ -507,36 +507,37 @@ if sd_used_bytes == 0: sd_used_bytes = 1 # Cloudsync log stats - try: - cs_used_bytes = int(subprocess.check_output(['du', '-bsx', UI2CS_FILE_CHANNELS_PATH]).split()[0].decode('utf-8')) - except subprocess.CalledProcessError as e: - g_utils.logger.error("Subprocess call error {0}.".format(str(e))) - return num_files_deleted, total_deleted_size - total_deleted_size = cs_used_bytes - # Retrieve file list - f = [] - for subdir, dir, files in os.walk(UI2CS_FILE_LOG_PATH): - for file in files: - f.append(os.path.join(UI2CS_FILE_LOG_PATH, file)) + used_bytes_proc_call = subprocess.check_output(['du', '-bsx', UI2CS_FILE_CHANNELS_PATH]).split() + if len(used_bytes_proc_call) > 0: + cs_used_bytes = int(used_bytes_proc_call[0].decode('utf-8')) - # Sorted with oldest modified first. - f.sort(key=lambda x: os.path.getmtime(x)) + total_deleted_size = cs_used_bytes + # Retrieve file list + f = [] + for subdir, dir, files in os.walk(UI2CS_FILE_LOG_PATH): + for file in files: + f.append(os.path.join(UI2CS_FILE_LOG_PATH, file)) - if len(f) > 1: - while (cs_used_bytes / sd_used_bytes) <= cs_log_pct: - file_to_remove = f[0] - os.remove(file_to_remove) - num_files_deleted += 1 - f.pop(0) - try: - cs_used_bytes = int( - subprocess.check_output(['du', '-bsx', UI2CS_FILE_CHANNELS_PATH]).split()[0].decode('utf-8')) - except subprocess.CalledProcessError as e: - g_utils.logger.error("Subprocess call error {0}.".format(str(e))) - break - total_deleted_size = total_deleted_size - cs_used_bytes + # Sorted with oldest modified first. + f.sort(key=lambda x: os.path.getmtime(x)) + + if len(f) > 1: + while (cs_used_bytes / sd_used_bytes) <= cs_log_pct: + file_to_remove = f[0] + os.remove(file_to_remove) + num_files_deleted += 1 + f.pop(0) + used_bytes_proc_call = subprocess.check_output(['du', '-bsx', UI2CS_FILE_CHANNELS_PATH]).split() + if len(used_bytes_proc_call) > 0: + cs_used_bytes = int(used_bytes_proc_call[0].decode('utf-8')) + else: + g_utils.logger.error("Error in disk usage call.") + break + total_deleted_size = total_deleted_size - cs_used_bytes + else: + total_deleted_size = 0 + g_utils.logger.info("No files Removed.") else: - total_deleted_size = 0 - g_utils.logger.info("No files Removed.") + g_utils.logger.error("Error in disk usage call.") return num_files_deleted, total_deleted_size