AaronFiore/electrum
1
0
Fork 0
Code Activity

logging: add config var "LOGS_NUM_FILES_KEEP" instead of hardcoded 10

Browse Source
This commit is contained in:
SomberNight
2023-09-06 16:55:04 +00:00
parent 43615487de
commit 5e8b14f742
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/logging.py
View File

@@ -117,9 +117,9 @@ class TruncatingMemoryHandler(logging.handlers.MemoryHandler):
super().close() super().close()
def _delete_old_logs(path, keep=10): def _delete_old_logs(path, *, num_files_keep: int):
files = sorted(list(pathlib.Path(path).glob("electrum_log_*.log")), reverse=True) files = sorted(list(pathlib.Path(path).glob("electrum_log_*.log")), reverse=True)
for f in files[keep:]: for f in files[num_files_keep:]:
try: try:
os.remove(str(f)) os.remove(str(f))
except OSError as e: except OSError as e:
@@ -127,12 +127,12 @@ def _delete_old_logs(path, keep=10):
_logfile_path = None _logfile_path = None
def _configure_file_logging(log_directory: pathlib.Path): def _configure_file_logging(log_directory: pathlib.Path, *, num_files_keep: int):
global _logfile_path global _logfile_path
assert _logfile_path is None, 'file logging already initialized' assert _logfile_path is None, 'file logging already initialized'
log_directory.mkdir(exist_ok=True) log_directory.mkdir(exist_ok=True)
_delete_old_logs(log_directory) _delete_old_logs(log_directory, num_files_keep=num_files_keep)
timestamp = datetime.datetime.utcnow().strftime("%Y%m%dT%H%M%SZ") timestamp = datetime.datetime.utcnow().strftime("%Y%m%dT%H%M%SZ")
PID = os.getpid() PID = os.getpid()
@@ -327,7 +327,8 @@ def configure_logging(config: 'SimpleConfig', *, log_to_file: Optional[bool] = N
log_to_file |= is_android_debug_apk() log_to_file |= is_android_debug_apk()
if log_to_file: if log_to_file:
log_directory = pathlib.Path(config.path) / "logs" log_directory = pathlib.Path(config.path) / "logs"
_configure_file_logging(log_directory) num_files_keep = config.LOGS_NUM_FILES_KEEP
_configure_file_logging(log_directory, num_files_keep=num_files_keep)
# clean up and delete in-memory logs # clean up and delete in-memory logs
global _inmemory_startup_logs global _inmemory_startup_logs

1
electrum/simple_config.py
View File

@@ -925,6 +925,7 @@ class SimpleConfig(Logger):
CLI_TIMEOUT = ConfigVar('timeout', default=60, type_=float) CLI_TIMEOUT = ConfigVar('timeout', default=60, type_=float)
AUTOMATIC_CENTRALIZED_UPDATE_CHECKS = ConfigVar('check_updates', default=False, type_=bool) AUTOMATIC_CENTRALIZED_UPDATE_CHECKS = ConfigVar('check_updates', default=False, type_=bool)
WRITE_LOGS_TO_DISK = ConfigVar('log_to_file', default=False, type_=bool) WRITE_LOGS_TO_DISK = ConfigVar('log_to_file', default=False, type_=bool)
LOGS_NUM_FILES_KEEP = ConfigVar('logs_num_files_keep', default=10, type_=int)
GUI_ENABLE_DEBUG_LOGS = ConfigVar('gui_enable_debug_logs', default=False, type_=bool) GUI_ENABLE_DEBUG_LOGS = ConfigVar('gui_enable_debug_logs', default=False, type_=bool)
LOCALIZATION_LANGUAGE = ConfigVar('language', default="", type_=str) LOCALIZATION_LANGUAGE = ConfigVar('language', default="", type_=str)
BLOCKCHAIN_PREFERRED_BLOCK = ConfigVar('blockchain_preferred_block', default=None) BLOCKCHAIN_PREFERRED_BLOCK = ConfigVar('blockchain_preferred_block', default=None)