From 37ed66f371bad04c20c8ef2a4bd3a9fa01d18b1a Mon Sep 17 00:00:00 2001 From: chenhui Date: Sun, 18 Dec 2022 22:08:37 -0800 Subject: [PATCH] =?UTF-8?q?[hotfix]=E8=A7=A3=E5=86=B3-t=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=E7=B1=BB=E5=9E=8B=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenhui --- README_zh.md | 4 ++-- services/hilogtool/log_controller.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README_zh.md b/README_zh.md index a989df9..8782cc5 100644 --- a/README_zh.md +++ b/README_zh.md @@ -127,7 +127,7 @@ release模式输出： | | | domainon | domain流控开关打开 | | | | domainoff | domain流控开关关闭 | | -L | --level | \ | 指定级别的日志，示例：-L D/I/W/E/F | -| -t | --type | \ | 指定类型的日志，示例：-t app core init | +| -t | --type | \ | 指定类型的日志，示例：-t app,core,init | | -D | --domain | \ | 指定domain | | -T | --Tag | \ | 指定tag | | -a | --head | \ | 只显示前\行日志 | @@ -166,7 +166,7 @@ release模式输出： 解释：执行名字为hilog的落盘任务，10个落盘文件进行轮转，单个文件落盘大小为66k，采用zlib压缩算法。 type、level、domain、tag支持排除查询，排除查询可以使用以"^"开头的参数和分隔符"，"."来完成 示例：hilog -t ^core,app 排除core和app类型的日志，可以与其他参数一起使用。 -示例：hilog -t app core 打印core和app类型的日志，可以与其他参数一起使用。 +示例：hilog -t app,core 打印core和app类型的日志，可以与其他参数一起使用。 ``` ## 涉及仓 diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp index 9addb78..5b898b6 100644 --- a/services/hilogtool/log_controller.cpp +++ b/services/hilogtool/log_controller.cpp @@ -152,9 +152,9 @@ string SetDefaultLogType(const std::string& logTypeStr) { string logType; if (logTypeStr == "") { - logType = "core app"; + logType = "core,app"; } else if (logTypeStr == "all") { - logType = "core app init"; + logType = "core,app,init"; } else { logType = logTypeStr; } @@ -261,7 +261,7 @@ int32_t BufferSizeOp(SeqPacketSocketClient& controller, uint8_t msgCmd, const st uint32_t logTypeNum; uint32_t iter; string logType = SetDefaultLogType(logTypeStr); - Split(logType, " ", vecLogType); + Split(logType, ",", vecLogType); logTypeNum = vecLogType.size(); switch (msgCmd) { case MC_REQ_BUFFER_SIZE: { @@ -360,7 +360,7 @@ int32_t LogClearOp(SeqPacketSocketClient& controller, uint8_t msgCmd, const std: uint32_t logTypeNum; uint32_t iter; string logType = SetDefaultLogType(logTypeStr); - Split(logType, " ", vecLogType); + Split(logType, ",", vecLogType); logTypeNum = vecLogType.size(); LogClearRequest* pLogClearReq = reinterpret_cast(msgToSend); LogClearMsg* pLogClearMsg = reinterpret_cast(&pLogClearReq->logClearMsg); @@ -397,7 +397,7 @@ int32_t LogPersistOp(SeqPacketSocketClient& controller, uint8_t msgCmd, LogPersi uint32_t fileSizeDefault = LOG_PERSIST_FILE_SIZE; uint32_t fileNumDefault = LOG_PERSIST_FILE_NUM; string logType = SetDefaultLogType(logPersistParam->logTypeStr); - Split(logType, " ", vecLogType); + Split(logType, ",", vecLogType); Split(logPersistParam->jobIdStr, " ", vecJobId); logTypeNum = vecLogType.size(); jobIdNum = vecJobId.size(); -- Gitee