From 60be78310ee6b6a5a091f27f9e5e514927d7520f Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sun, 27 Jul 2025 13:20:15 +0200 Subject: [PATCH] Remove old app config methods --- __init__.py | 89 +++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 75 deletions(-) diff --git a/__init__.py b/__init__.py index 84c72fb..6c92af7 100644 --- a/__init__.py +++ b/__init__.py @@ -203,7 +203,21 @@ def add_handler_socket(logger: logging.Logger, level: int = logging.DEBUG, host: logger.addHandler(handler) return handler + def default_logging_config(fmt=JOURNAL_FMT): + """This requires a config file with at least these line: + + import logging + + + DEBUG = False + # + # Logging + # + APP_NAME = "" + LOG_HOSTNAME = "loggy" # When DEBUG is True + LOG_LEVEL = logging.INFO # STDOUT logging + """ logger = logging.getLogger(ROOT_LOGGER_NAME) add_handler_stdout(logger, config.LOG_LEVEL, fmt=fmt) @@ -212,81 +226,6 @@ def default_logging_config(fmt=JOURNAL_FMT): return logger -def appLoggingConfigure(basepath, target, log_name_lvl=[], target_level=logging.DEBUG, fmt=SHORT_FMT, ring_logs=None, host=None, port=None): - target_handlers = ['main', ] - # define handler - # - if target == 'stdout': - handler = dict(main={ - 'level': logging.getLevelName(target_level), - 'formatter': 'format', - 'class': 'logging.StreamHandler', - 'stream': 'ext://sys.stdout', - }) - elif target == 'logfile': - handler = dict(main={ - 'level': logging.getLevelName(target_level), - 'formatter': 'json', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(basepath, 'messages.log'), - 'mode': 'a', - 'maxBytes': 10485760, - 'backupCount': 7 - }) - else: - handler = dict(main={ - 'level': 'DEBUG', - 'formatter': 'json', - 'class': 'logging.NullHandler', - }) - if host is not None and port is not None: - target_handlers.append('socket') - handler['socket'] = { - 'level': 'DEBUG', - 'class': 'logging.handlers.SocketHandler', - 'host': host, - 'port': port - } - if ring_logs is not None: - target_handlers.append('ring') - handler['ring'] = { - 'class': 'report.collectingRingHandler', - 'max_logs': ring_logs, - } - # define loggers - # - loggers = {} - for name, lvl in log_name_lvl: - loggers[name] = { - 'handlers': target_handlers, - 'level': lvl, - 'propagate': False - } - # configure logging - # - dictConfig(dict( - version=1, - formatters={ - 'json': { - '()': JsonFormatter - }, - 'long': { - 'format': LONG_FMT - }, - 'format': { - 'format': fmt, - }, - }, - handlers=handler, - loggers=loggers, - )) - logger.critical("The method report.appLoggingConfigure is DEPRECIATED... Change to add_handler-* methods") - - -def stdoutLoggingConfigure(log_name_lvl=[], fmt=SHORT_FMT): - appLoggingConfigure(None, 'stdout', log_name_lvl=log_name_lvl, fmt=fmt) - - class testSession(dict): KEY_NAME = 'name' KEY_FAILED_TESTS = 'number_of_failed_tests'