From b0bfc4d952d9ca97d420a5ba97227bf9b7478f03 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sun, 27 Jul 2025 13:05:19 +0200 Subject: [PATCH] Adaption to default logging method --- config_example/config.j2 | 18 +++++++++--------- file2mail.py | 11 +---------- report | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/config_example/config.j2 b/config_example/config.j2 index 24fc68f..fa8557c 100644 --- a/config_example/config.j2 +++ b/config_example/config.j2 @@ -1,6 +1,15 @@ import logging +DEBUG = False +# +# Logging +# +APP_NAME = "file2mail" +LOG_HOSTNAME = "loggy" # When DEBUG is True +LOG_LEVEL = logging.INFO # STDOUT logging + + # Folder to be monitored for new files TARGET_FOLDER = "{{ server_ftp_scan_target_folder }}" @@ -12,12 +21,3 @@ SEND_FROM = "Scanner >" SMTP_SERVER = "{{ server_ftp_scan_smtp_server }}" SMTP_USER = "{{ server_ftp_scan_smtp_user }}" SMTP_PASSWORD = "{{ server_ftp_scan_smtp_password }}" - -# -# Logging -# -APP_NAME = "file2mail" - -DEBUG = False -LOG_HOSTNAME = "loggy" # When DEBUG is True -LOG_LEVEL = logging.INFO # STDOUT logging diff --git a/file2mail.py b/file2mail.py index a94bed4..7f6ffc1 100644 --- a/file2mail.py +++ b/file2mail.py @@ -12,16 +12,7 @@ import time CYCLE_TIME = 60 SLEEP_TIME = .5 -try: - from config import APP_NAME as ROOT_LOGGER_NAME -except ImportError: - ROOT_LOGGER_NAME = 'root' -logger = logging.getLogger(ROOT_LOGGER_NAME) - -report.add_handler_stdout(logger, config.LOG_LEVEL) -if config.DEBUG: - report.add_handler_socket(logger, host=config.LOG_HOSTNAME) - +logger = report.default_logging_config() class GracefulKiller: kill_now = False diff --git a/report b/report index 3b8fbbc..9ad0dd0 160000 --- a/report +++ b/report @@ -1 +1 @@ -Subproject commit 3b8fbbc0844d17377b3d5da84bca8cad6d24d143 +Subproject commit 9ad0dd05a5daaed39308e5c5fd87d46e142fd800