diff --git a/package/etc/ahriman.ini.d/logging.ini b/package/etc/ahriman.ini.d/logging.ini index 96c2f017..4a47dd24 100644 --- a/package/etc/ahriman.ini.d/logging.ini +++ b/package/etc/ahriman.ini.d/logging.ini @@ -1,5 +1,5 @@ [loggers] -keys = root,builder,build_details,http,stderr +keys = root,build_details,http,stderr,boto3,botocore,nose,s3transfer [handlers] keys = console_handler,syslog_handler @@ -20,11 +20,11 @@ formatter = syslog_format args = ("/dev/log",) [formatter_generic_format] -format = [%(levelname)s %(asctime)s] [%(filename)s:%(lineno)d] [%(funcName)s]: %(message)s +format = [%(levelname)s %(asctime)s] [%(filename)s:%(lineno)d %(funcName)s]: %(message)s datefmt = [formatter_syslog_format] -format = [%(levelname)s] [%(filename)s:%(lineno)d] [%(funcName)s]: %(message)s +format = [%(levelname)s] [%(name)s] [%(filename)s:%(lineno)d] [%(funcName)s]: %(message)s datefmt = [logger_root] @@ -32,12 +32,6 @@ level = DEBUG handlers = syslog_handler qualname = root -[logger_builder] -level = DEBUG -handlers = syslog_handler -qualname = builder -propagate = 0 - [logger_build_details] level = DEBUG handlers = syslog_handler @@ -54,3 +48,27 @@ propagate = 0 level = DEBUG handlers = console_handler qualname = stderr + +[logger_boto3] +level = INFO +handlers = syslog_handler +qualname = boto3 +propagate = 0 + +[logger_botocore] +level = INFO +handlers = syslog_handler +qualname = botocore +propagate = 0 + +[logger_nose] +level = INFO +handlers = syslog_handler +qualname = nose +propagate = 0 + +[logger_s3transfer] +level = INFO +handlers = syslog_handler +qualname = s3transfer +propagate = 0 diff --git a/src/ahriman/core/build_tools/task.py b/src/ahriman/core/build_tools/task.py index 48195843..4345f642 100644 --- a/src/ahriman/core/build_tools/task.py +++ b/src/ahriman/core/build_tools/task.py @@ -49,7 +49,7 @@ class Task: :param configuration: configuration instance :param paths: repository paths instance """ - self.logger = logging.getLogger("builder") + self.logger = logging.getLogger("root") self.build_logger = logging.getLogger("build_details") self.package = package self.paths = paths diff --git a/src/ahriman/core/configuration.py b/src/ahriman/core/configuration.py index a2107a5d..0cc1cb4c 100644 --- a/src/ahriman/core/configuration.py +++ b/src/ahriman/core/configuration.py @@ -39,7 +39,7 @@ class Configuration(configparser.RawConfigParser): :cvar DEFAULT_LOG_LEVEL: default log level (in case of fallback) """ - DEFAULT_LOG_FORMAT = "[%(levelname)s %(asctime)s] [%(filename)s:%(lineno)d] [%(funcName)s]: %(message)s" + DEFAULT_LOG_FORMAT = "[%(levelname)s %(asctime)s] [%(filename)s:%(lineno)d %(funcName)s]: %(message)s" DEFAULT_LOG_LEVEL = logging.DEBUG ARCHITECTURE_SPECIFIC_SECTIONS = ["build", "sign", "web"] diff --git a/src/ahriman/core/report/report.py b/src/ahriman/core/report/report.py index e8f60a9c..173ee431 100644 --- a/src/ahriman/core/report/report.py +++ b/src/ahriman/core/report/report.py @@ -43,7 +43,7 @@ class Report: :param architecture: repository architecture :param configuration: configuration instance """ - self.logger = logging.getLogger("builder") + self.logger = logging.getLogger("root") self.architecture = architecture self.configuration = configuration diff --git a/src/ahriman/core/repository/properties.py b/src/ahriman/core/repository/properties.py index b60e181e..be3226ec 100644 --- a/src/ahriman/core/repository/properties.py +++ b/src/ahriman/core/repository/properties.py @@ -52,7 +52,7 @@ class Properties: :param configuration: configuration instance :param no_report: force disable reporting """ - self.logger = logging.getLogger("builder") + self.logger = logging.getLogger("root") self.architecture = architecture self.configuration = configuration diff --git a/src/ahriman/core/upload/upload.py b/src/ahriman/core/upload/upload.py index 99c8255e..8c08d51d 100644 --- a/src/ahriman/core/upload/upload.py +++ b/src/ahriman/core/upload/upload.py @@ -44,7 +44,7 @@ class Upload: :param architecture: repository architecture :param configuration: configuration instance """ - self.logger = logging.getLogger("builder") + self.logger = logging.getLogger("root") self.architecture = architecture self.config = configuration