From 544cb6285a12599d405b0a0ff3ef9acf771c50b2 Mon Sep 17 00:00:00 2001 From: alichinese Date: Sun, 28 Apr 2024 15:53:56 +0800 Subject: [PATCH] log: optimize log print * the log print to file is just in bitbake and toolchain command, otherwish print in stdout Signed-off-by: alichinese --- src/oebuild/app/plugins/bitbake/bitbake.py | 3 ++- src/oebuild/app/plugins/toolchain/toolchain.py | 4 +++- src/oebuild/m_log.py | 15 ++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/oebuild/app/plugins/bitbake/bitbake.py b/src/oebuild/app/plugins/bitbake/bitbake.py index a65cb63..7a35c53 100644 --- a/src/oebuild/app/plugins/bitbake/bitbake.py +++ b/src/oebuild/app/plugins/bitbake/bitbake.py @@ -25,7 +25,7 @@ from oebuild.parse_env import ParseEnv import oebuild.util as oebuild_util from oebuild.app.plugins.bitbake.in_container import InContainer from oebuild.app.plugins.bitbake.in_host import InHost -from oebuild.m_log import logger +from oebuild.m_log import logger, set_log_to_file import oebuild.const as oebuild_const @@ -77,6 +77,7 @@ class Bitbake(OebuildCommand): if '-h' in unknown or '--help' in unknown: self.print_help_msg() sys.exit(0) + set_log_to_file() command = self._get_command(unknow=unknown) diff --git a/src/oebuild/app/plugins/toolchain/toolchain.py b/src/oebuild/app/plugins/toolchain/toolchain.py index 613e712..ce4e586 100644 --- a/src/oebuild/app/plugins/toolchain/toolchain.py +++ b/src/oebuild/app/plugins/toolchain/toolchain.py @@ -19,7 +19,7 @@ import subprocess from docker.models.containers import ExecResult from oebuild.command import OebuildCommand -from oebuild.m_log import logger +from oebuild.m_log import logger, set_log_to_file import oebuild.util as oebuild_util import oebuild.const as oebuild_const from oebuild.parse_param import ParseToolchainParam @@ -64,6 +64,8 @@ class Toolchain(OebuildCommand): self.print_help_msg() sys.exit(0) + set_log_to_file() + if not self._check_support_toolchain(): logger.error( "Please do it in compile workspace which contain toolchain.yaml") diff --git a/src/oebuild/m_log.py b/src/oebuild/m_log.py index 6ac7737..2179c86 100644 --- a/src/oebuild/m_log.py +++ b/src/oebuild/m_log.py @@ -28,16 +28,21 @@ ERR_COLOR = colorama.Fore.LIGHTRED_EX logger = logging.getLogger() logger.setLevel(logging.INFO) -fh = logging.FileHandler('oebuild.log') -fh.setLevel(logging.INFO) - ch = logging.StreamHandler(stream=sys.stdout) ch.setLevel(logging.INFO) formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') -fh.setFormatter(formatter) ch.setFormatter(formatter) -logger.addHandler(fh) logger.addHandler(ch) + + +def set_log_to_file(): + ''' + set log to log file + ''' + fh = logging.FileHandler('oebuild.log') + fh.setLevel(logging.INFO) + fh.setFormatter(formatter) + logger.addHandler(fh) -- Gitee