mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-19 09:40:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

logging_util: support to tweak loglevel directed to stderr/stdout

Browse Source 
Previously we set loglevel >= WARNING printed to stderr and
loglevel < WARNING printed to stdout. To be more flexible, we
replace this `WARNING` value with an argument: split_level and leave
`WARNING` as default split_level if not set.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-08-14 10:33:37 +08:00
parent ee07afa205
commit 1998aac349
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/code_size_compare.py
View File

@ -906,11 +906,8 @@ def main():
comp_args = parser.parse_args() comp_args = parser.parse_args()
logger = logging.getLogger() logger = logging.getLogger()
logging_util.configure_logger(logger) logging_util.configure_logger(logger, split_level=logging.NOTSET)
if comp_args.stdout and not comp_args.verbose: logger.setLevel(logging.DEBUG if comp_args.verbose else logging.INFO)
logger.setLevel(logging.ERROR)
else:
logger.setLevel(logging.DEBUG if comp_args.verbose else logging.INFO)
if os.path.isfile(comp_args.record_dir): if os.path.isfile(comp_args.record_dir):
logger.error("record directory: {} is not a directory" logger.error("record directory: {} is not a directory"

16
scripts/mbedtls_dev/logging_util.py
View File

@ -21,14 +21,16 @@ import sys
def configure_logger( def configure_logger(
logger: logging.Logger, logger: logging.Logger,
log_format="[%(levelname)s]: %(message)s" log_format="[%(levelname)s]: %(message)s",
split_level=logging.WARNING
) -> None: ) -> None:
""" """
Configure the logging.Logger instance so that: Configure the logging.Logger instance so that:
- Format is set to any log_format. - Format is set to any log_format.
Default: "[%(levelname)s]: %(message)s" Default: "[%(levelname)s]: %(message)s"
- loglevel >= WARNING are printed to stderr. - loglevel >= split_level are printed to stderr.
- loglevel < WARNING are printed to stdout. - loglevel < split_level are printed to stdout.
Default: logging.WARNING
""" """
class MaxLevelFilter(logging.Filter): class MaxLevelFilter(logging.Filter):
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
@ -41,14 +43,14 @@ def configure_logger(
log_formatter = logging.Formatter(log_format) log_formatter = logging.Formatter(log_format)
# set loglevel >= WARNING to be printed to stderr # set loglevel >= split_level to be printed to stderr
stderr_hdlr = logging.StreamHandler(sys.stderr) stderr_hdlr = logging.StreamHandler(sys.stderr)
stderr_hdlr.setLevel(logging.WARNING) stderr_hdlr.setLevel(split_level)
stderr_hdlr.setFormatter(log_formatter) stderr_hdlr.setFormatter(log_formatter)
# set loglevel <= INFO to be printed to stdout # set loglevel < split_level to be printed to stdout
stdout_hdlr = logging.StreamHandler(sys.stdout) stdout_hdlr = logging.StreamHandler(sys.stdout)
stdout_hdlr.addFilter(MaxLevelFilter(logging.INFO)) stdout_hdlr.addFilter(MaxLevelFilter(split_level - 1))
stdout_hdlr.setFormatter(log_formatter) stdout_hdlr.setFormatter(log_formatter)
logger.addHandler(stderr_hdlr) logger.addHandler(stderr_hdlr)