From 23a75ad9fb1b8f3b6f6268b93fa810445882002d Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Sun, 25 Feb 2024 18:32:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BF=AE=E6=94=B9lo?= =?UTF-8?q?gback.xml=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AF=B9info=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=88=AB=E7=9A=84=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=9C=A8neatlogic=E8=B7=AF=E5=BE=84=E4=B8=8B=E6=89=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1099304205254656]修改logback.xml文件，对info以下级别的日志，只在neatlogic路径下才输出 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1099304205254656 --- .../boolex/ConsoleFilterEvaluator.java | 136 ++++++++++++++++++ ...valuator.java => PathFilterEvaluator.java} | 2 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java rename src/main/java/neatlogic/framework/logback/boolex/{CustomFilterEvaluator.java => PathFilterEvaluator.java} (96%) diff --git a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java new file mode 100644 index 000000000..c50e8f8e8 --- /dev/null +++ b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java @@ -0,0 +1,136 @@ +/* + * Copyright(c) 2023 NeatLogic Co., Ltd. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package neatlogic.framework.logback.boolex; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.boolex.EventEvaluatorBase; +import org.apache.commons.lang3.StringUtils; + +public class ConsoleFilterEvaluator extends EventEvaluatorBase { + + private String errorPathList; + + private String warnPathList; + + private String infoPathList; + + private String debugPathList; + + private String tracePathList; + + @Override + public boolean evaluate(ILoggingEvent event) throws NullPointerException { + if (event.getLevel() == Level.ERROR) { + if(StringUtils.isNotBlank(errorPathList)) { + String[] split = errorPathList.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : split) { + if (loggerName.startsWith(path)) { + return true; + } + } + return false; + } + } else if (event.getLevel() == Level.WARN) { + if(StringUtils.isNotBlank(warnPathList)) { + String[] split = warnPathList.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : split) { + if (loggerName.startsWith(path)) { + return true; + } + } + return false; + } + } else if (event.getLevel() == Level.INFO) { + if(StringUtils.isNotBlank(infoPathList)) { + String[] split = infoPathList.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : split) { + if (loggerName.startsWith(path)) { + return true; + } + } + return false; + } + } else if (event.getLevel() == Level.DEBUG) { + if(StringUtils.isNotBlank(debugPathList)) { + String[] split = debugPathList.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : split) { + if (loggerName.startsWith(path)) { + return true; + } + } + return false; + } + } else if (event.getLevel() == Level.TRACE) { + if(StringUtils.isNotBlank(tracePathList)) { + String[] split = tracePathList.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : split) { + if (loggerName.startsWith(path)) { + return true; + } + } + return false; + } + } + return true; + } + + public String getErrorPathList() { + return errorPathList; + } + + public void setErrorPathList(String errorPathList) { + this.errorPathList = errorPathList; + } + + public String getWarnPathList() { + return warnPathList; + } + + public void setWarnPathList(String warnPathList) { + this.warnPathList = warnPathList; + } + + public String getInfoPathList() { + return infoPathList; + } + + public void setInfoPathList(String infoPathList) { + this.infoPathList = infoPathList; + } + + public String getDebugPathList() { + return debugPathList; + } + + public void setDebugPathList(String debugPathList) { + this.debugPathList = debugPathList; + } + + public String getTracePathList() { + return tracePathList; + } + + public void setTracePathList(String tracePathList) { + this.tracePathList = tracePathList; + } +} diff --git a/src/main/java/neatlogic/framework/logback/boolex/CustomFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java similarity index 96% rename from src/main/java/neatlogic/framework/logback/boolex/CustomFilterEvaluator.java rename to src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java index 3d1e44d9d..4f7551b36 100644 --- a/src/main/java/neatlogic/framework/logback/boolex/CustomFilterEvaluator.java +++ b/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils; /** * 优先使用白名单。及：如果白名单和黑名单同时配置，则使用白名单 */ -public class CustomFilterEvaluator extends EventEvaluatorBase { +public class PathFilterEvaluator extends EventEvaluatorBase { private String whitelist; -- Gitee From 1288c315c33f91e101e51b05a4056f2876ca6052 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Mon, 26 Feb 2024 10:02:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BF=AE=E6=94=B9lo?= =?UTF-8?q?gback.xml=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AF=B9info=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=88=AB=E7=9A=84=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=9C=A8neatlogic=E8=B7=AF=E5=BE=84=E4=B8=8B=E6=89=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1099304205254656]修改logback.xml文件，对info以下级别的日志，只在neatlogic路径下才输出 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1099304205254656 --- .../boolex/ConsoleFilterEvaluator.java | 205 ++++++++++++++---- 1 file changed, 160 insertions(+), 45 deletions(-) diff --git a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java index c50e8f8e8..bce811346 100644 --- a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java +++ b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java @@ -23,114 +23,229 @@ import org.apache.commons.lang3.StringUtils; public class ConsoleFilterEvaluator extends EventEvaluatorBase { - private String errorPathList; + private String errorWhitelist; - private String warnPathList; + private String errorBlacklist; - private String infoPathList; + private String warnWhitelist; - private String debugPathList; + private String warnBlacklist; - private String tracePathList; + private String infoWhitelist; + + private String infoBlacklist; + + private String debugWhitelist; + + private String debugBlacklist; + + private String traceWhitelist; + + private String traceBlacklist; @Override public boolean evaluate(ILoggingEvent event) throws NullPointerException { if (event.getLevel() == Level.ERROR) { - if(StringUtils.isNotBlank(errorPathList)) { - String[] split = errorPathList.split("\\|"); + if(StringUtils.isNotBlank(errorWhitelist)) { + boolean flag = false; + String[] split = errorWhitelist.split("\\|"); String loggerName = event.getLoggerName(); for (String path : split) { if (loggerName.startsWith(path)) { - return true; + flag = true; + break; + } + } + if (!flag) { + return false; + } + } + if(StringUtils.isNotBlank(errorBlacklist)) { + String[] blackList = errorBlacklist.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : blackList) { + if (loggerName.startsWith(path)) { + return false; } } - return false; } } else if (event.getLevel() == Level.WARN) { - if(StringUtils.isNotBlank(warnPathList)) { - String[] split = warnPathList.split("\\|"); + if(StringUtils.isNotBlank(warnWhitelist)) { + boolean flag = false; + String[] split = warnWhitelist.split("\\|"); String loggerName = event.getLoggerName(); for (String path : split) { if (loggerName.startsWith(path)) { - return true; + flag = true; + break; + } + } + if (!flag) { + return false; + } + } + if(StringUtils.isNotBlank(warnBlacklist)) { + String[] blackList = warnBlacklist.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : blackList) { + if (loggerName.startsWith(path)) { + return false; } } - return false; } } else if (event.getLevel() == Level.INFO) { - if(StringUtils.isNotBlank(infoPathList)) { - String[] split = infoPathList.split("\\|"); + if(StringUtils.isNotBlank(infoWhitelist)) { + boolean flag = false; + String[] split = infoWhitelist.split("\\|"); String loggerName = event.getLoggerName(); for (String path : split) { if (loggerName.startsWith(path)) { - return true; + flag = true; + break; + } + } + if (!flag) { + return false; + } + } + if(StringUtils.isNotBlank(infoBlacklist)) { + String[] blackList = infoBlacklist.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : blackList) { + if (loggerName.startsWith(path)) { + return false; } } - return false; } } else if (event.getLevel() == Level.DEBUG) { - if(StringUtils.isNotBlank(debugPathList)) { - String[] split = debugPathList.split("\\|"); + if(StringUtils.isNotBlank(debugWhitelist)) { + boolean flag = false; + String[] split = debugWhitelist.split("\\|"); String loggerName = event.getLoggerName(); for (String path : split) { if (loggerName.startsWith(path)) { - return true; + flag = true; + break; + } + } + if (!flag) { + return false; + } + } + if(StringUtils.isNotBlank(debugBlacklist)) { + String[] blackList = debugBlacklist.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : blackList) { + if (loggerName.startsWith(path)) { + return false; } } - return false; } } else if (event.getLevel() == Level.TRACE) { - if(StringUtils.isNotBlank(tracePathList)) { - String[] split = tracePathList.split("\\|"); + if(StringUtils.isNotBlank(traceWhitelist)) { + boolean flag = false; + String[] split = traceWhitelist.split("\\|"); String loggerName = event.getLoggerName(); for (String path : split) { if (loggerName.startsWith(path)) { - return true; + flag = true; + break; + } + } + if (!flag) { + return false; + } + } + if(StringUtils.isNotBlank(traceBlacklist)) { + String[] blackList = traceBlacklist.split("\\|"); + String loggerName = event.getLoggerName(); + for (String path : blackList) { + if (loggerName.startsWith(path)) { + return false; } } - return false; } } return true; } - public String getErrorPathList() { - return errorPathList; + public String getErrorWhitelist() { + return errorWhitelist; + } + + public void setErrorWhitelist(String errorWhitelist) { + this.errorWhitelist = errorWhitelist; + } + + public String getErrorBlacklist() { + return errorBlacklist; + } + + public void setErrorBlacklist(String errorBlacklist) { + this.errorBlacklist = errorBlacklist; + } + + public String getWarnWhitelist() { + return warnWhitelist; + } + + public void setWarnWhitelist(String warnWhitelist) { + this.warnWhitelist = warnWhitelist; + } + + public String getWarnBlacklist() { + return warnBlacklist; + } + + public void setWarnBlacklist(String warnBlacklist) { + this.warnBlacklist = warnBlacklist; + } + + public String getInfoWhitelist() { + return infoWhitelist; + } + + public void setInfoWhitelist(String infoWhitelist) { + this.infoWhitelist = infoWhitelist; + } + + public String getInfoBlacklist() { + return infoBlacklist; } - public void setErrorPathList(String errorPathList) { - this.errorPathList = errorPathList; + public void setInfoBlacklist(String infoBlacklist) { + this.infoBlacklist = infoBlacklist; } - public String getWarnPathList() { - return warnPathList; + public String getDebugWhitelist() { + return debugWhitelist; } - public void setWarnPathList(String warnPathList) { - this.warnPathList = warnPathList; + public void setDebugWhitelist(String debugWhitelist) { + this.debugWhitelist = debugWhitelist; } - public String getInfoPathList() { - return infoPathList; + public String getDebugBlacklist() { + return debugBlacklist; } - public void setInfoPathList(String infoPathList) { - this.infoPathList = infoPathList; + public void setDebugBlacklist(String debugBlacklist) { + this.debugBlacklist = debugBlacklist; } - public String getDebugPathList() { - return debugPathList; + public String getTraceWhitelist() { + return traceWhitelist; } - public void setDebugPathList(String debugPathList) { - this.debugPathList = debugPathList; + public void setTraceWhitelist(String traceWhitelist) { + this.traceWhitelist = traceWhitelist; } - public String getTracePathList() { - return tracePathList; + public String getTraceBlacklist() { + return traceBlacklist; } - public void setTracePathList(String tracePathList) { - this.tracePathList = tracePathList; + public void setTraceBlacklist(String traceBlacklist) { + this.traceBlacklist = traceBlacklist; } } -- Gitee From bbd9515c7c6f77ceb9e8d93bd2d78ff9bae56415 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Mon, 26 Feb 2024 10:59:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BF=AE=E6=94=B9lo?= =?UTF-8?q?gback.xml=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AF=B9info=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=88=AB=E7=9A=84=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=9C=A8neatlogic=E8=B7=AF=E5=BE=84=E4=B8=8B=E6=89=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1099304205254656]修改logback.xml文件，对info以下级别的日志，只在neatlogic路径下才输出 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1099304205254656 --- .../boolex/ConsoleFilterEvaluator.java | 43 ++++++++++--------- .../logback/boolex/PathFilterEvaluator.java | 23 +++++----- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java index bce811346..45448e39c 100644 --- a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java +++ b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java @@ -20,9 +20,12 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.boolex.EventEvaluatorBase; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.AntPathMatcher; public class ConsoleFilterEvaluator extends EventEvaluatorBase { + private static AntPathMatcher antPathMatcher = new AntPathMatcher("."); + private String errorWhitelist; private String errorBlacklist; @@ -50,8 +53,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { boolean flag = false; String[] split = errorWhitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : split) { - if (loggerName.startsWith(path)) { + for (String pattern : split) { + if (antPathMatcher.match(pattern, loggerName)) { flag = true; break; } @@ -63,8 +66,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { if(StringUtils.isNotBlank(errorBlacklist)) { String[] blackList = errorBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : blackList) { - if (loggerName.startsWith(path)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } @@ -74,8 +77,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { boolean flag = false; String[] split = warnWhitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : split) { - if (loggerName.startsWith(path)) { + for (String pattern : split) { + if (antPathMatcher.match(pattern, loggerName)) { flag = true; break; } @@ -87,8 +90,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { if(StringUtils.isNotBlank(warnBlacklist)) { String[] blackList = warnBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : blackList) { - if (loggerName.startsWith(path)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } @@ -98,8 +101,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { boolean flag = false; String[] split = infoWhitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : split) { - if (loggerName.startsWith(path)) { + for (String pattern : split) { + if (antPathMatcher.match(pattern, loggerName)) { flag = true; break; } @@ -111,8 +114,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { if(StringUtils.isNotBlank(infoBlacklist)) { String[] blackList = infoBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : blackList) { - if (loggerName.startsWith(path)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } @@ -122,8 +125,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { boolean flag = false; String[] split = debugWhitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : split) { - if (loggerName.startsWith(path)) { + for (String pattern : split) { + if (antPathMatcher.match(pattern, loggerName)) { flag = true; break; } @@ -135,8 +138,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { if(StringUtils.isNotBlank(debugBlacklist)) { String[] blackList = debugBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : blackList) { - if (loggerName.startsWith(path)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } @@ -146,8 +149,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { boolean flag = false; String[] split = traceWhitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : split) { - if (loggerName.startsWith(path)) { + for (String pattern : split) { + if (antPathMatcher.match(pattern, loggerName)) { flag = true; break; } @@ -159,8 +162,8 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { if(StringUtils.isNotBlank(traceBlacklist)) { String[] blackList = traceBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String path : blackList) { - if (loggerName.startsWith(path)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } diff --git a/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java index 4f7551b36..99021bd8b 100644 --- a/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java +++ b/src/main/java/neatlogic/framework/logback/boolex/PathFilterEvaluator.java @@ -20,41 +20,44 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.EventEvaluatorBase; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.AntPathMatcher; /** * 优先使用白名单。及：如果白名单和黑名单同时配置，则使用白名单 */ public class PathFilterEvaluator extends EventEvaluatorBase { + private static AntPathMatcher antPathMatcher = new AntPathMatcher("."); + private String whitelist; private String blacklist; @Override public boolean evaluate(ILoggingEvent event) throws NullPointerException, EvaluationException { - if (StringUtils.isBlank(whitelist) && StringUtils.isBlank(blacklist)) { - return true; - } if(StringUtils.isNotBlank(whitelist)) { + boolean flag = false; String[] whiteList = whitelist.split("\\|"); String loggerName = event.getLoggerName(); - for (String white : whiteList) { - if (loggerName.startsWith(white)) { - return true; + for (String pattern : whiteList) { + if (antPathMatcher.match(pattern, loggerName)) { + flag = true; + break; } } - return false; + if (!flag) { + return false; + } } if(StringUtils.isNotBlank(blacklist)) { String[] blackList = blacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String black : blackList) { - if (loggerName.startsWith(black)) { + for (String pattern : blackList) { + if (antPathMatcher.match(pattern, loggerName)) { return false; } } - return true; } return true; } -- Gitee From 2c06b7896b0f6d97f11dc4699b85492bf291a28b Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Mon, 26 Feb 2024 11:39:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BF=AE=E6=94=B9lo?= =?UTF-8?q?gback.xml=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AF=B9info=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=88=AB=E7=9A=84=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=9C=A8neatlogic=E8=B7=AF=E5=BE=84=E4=B8=8B=E6=89=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1099304205254656]修改logback.xml文件，对info以下级别的日志，只在neatlogic路径下才输出 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1099304205254656 --- .../boolex/ConsoleFilterEvaluator.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java index 45448e39c..23d6b2830 100644 --- a/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java +++ b/src/main/java/neatlogic/framework/logback/boolex/ConsoleFilterEvaluator.java @@ -64,9 +64,9 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { } } if(StringUtils.isNotBlank(errorBlacklist)) { - String[] blackList = errorBlacklist.split("\\|"); + String[] split = errorBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String pattern : blackList) { + for (String pattern : split) { if (antPathMatcher.match(pattern, loggerName)) { return false; } @@ -88,9 +88,9 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { } } if(StringUtils.isNotBlank(warnBlacklist)) { - String[] blackList = warnBlacklist.split("\\|"); + String[] split = warnBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String pattern : blackList) { + for (String pattern : split) { if (antPathMatcher.match(pattern, loggerName)) { return false; } @@ -112,9 +112,9 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { } } if(StringUtils.isNotBlank(infoBlacklist)) { - String[] blackList = infoBlacklist.split("\\|"); + String[] split = infoBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String pattern : blackList) { + for (String pattern : split) { if (antPathMatcher.match(pattern, loggerName)) { return false; } @@ -136,9 +136,9 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { } } if(StringUtils.isNotBlank(debugBlacklist)) { - String[] blackList = debugBlacklist.split("\\|"); + String[] split = debugBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String pattern : blackList) { + for (String pattern : split) { if (antPathMatcher.match(pattern, loggerName)) { return false; } @@ -160,9 +160,9 @@ public class ConsoleFilterEvaluator extends EventEvaluatorBase { } } if(StringUtils.isNotBlank(traceBlacklist)) { - String[] blackList = traceBlacklist.split("\\|"); + String[] split = traceBlacklist.split("\\|"); String loggerName = event.getLoggerName(); - for (String pattern : blackList) { + for (String pattern : split) { if (antPathMatcher.match(pattern, loggerName)) { return false; } -- Gitee