From d9aab9ac7fe7d9d81b32000e64a25309293239a5 Mon Sep 17 00:00:00 2001 From: wuhanxiao Date: Thu, 16 Nov 2023 10:59:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[modify]=20=E4=BF=AE=E6=94=B9=20GlobalCache?= =?UTF-8?q?BshScriptEvaluator=20=E7=9A=84=20logger=20=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsh/GlobalCacheBshScriptEvaluator.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java b/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java index 9751e2e2f..9f7706a8d 100644 --- a/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java +++ b/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java @@ -1,32 +1,17 @@ package com.pamirs.pradar.script.bsh; -import bsh.EvalError; import bsh.Interpreter; import bsh.NameSpace; import com.pamirs.attach.plugin.dynamic.reflect.ReflectionUtils; -import com.pamirs.pradar.internal.config.MockConfig; -import com.pamirs.pradar.pressurement.agent.event.IEvent; -import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigAddEvent; -import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigModifyEvent; -import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigRemoveEvent; -import com.pamirs.pradar.pressurement.agent.listener.EventResult; -import com.pamirs.pradar.pressurement.agent.listener.PradarEventListener; -import com.pamirs.pradar.pressurement.agent.shared.service.EventRouter; -import com.pamirs.pradar.pressurement.agent.shared.service.GlobalConfig; import com.pamirs.pradar.script.ScriptEvaluator; -import com.pamirs.pradar.script.commons.InterpreterWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.StringReader; -import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; public class GlobalCacheBshScriptEvaluator implements ScriptEvaluator { - private final static Logger logger = LoggerFactory.getLogger("ThreadLocalScriptEvaluator-LOGGER"); + private final static Logger logger = LoggerFactory.getLogger("GlobalCacheBshScriptEvaluator-LOGGER"); private ClassLoader classLoader; From 704eef8b746f10b9bcb6ef6e6466e46d6c0e6091 Mon Sep 17 00:00:00 2001 From: wuhanxiao Date: Thu, 16 Nov 2023 16:24:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[modify]=20=E4=BF=AE=E6=94=B9=20GlobalCache?= =?UTF-8?q?BshScriptEvaluator=20=E7=9A=84=20logger=20=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/bsh/GlobalCacheBshScriptEvaluator.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java b/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java index 9f7706a8d..32d5d244d 100644 --- a/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java +++ b/instrument-modules/user-modules/module-pradar-core/src/main/java/com/pamirs/pradar/script/bsh/GlobalCacheBshScriptEvaluator.java @@ -1,13 +1,28 @@ package com.pamirs.pradar.script.bsh; +import bsh.EvalError; import bsh.Interpreter; import bsh.NameSpace; import com.pamirs.attach.plugin.dynamic.reflect.ReflectionUtils; +import com.pamirs.pradar.internal.config.MockConfig; +import com.pamirs.pradar.pressurement.agent.event.IEvent; +import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigAddEvent; +import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigModifyEvent; +import com.pamirs.pradar.pressurement.agent.event.impl.MockConfigRemoveEvent; +import com.pamirs.pradar.pressurement.agent.listener.EventResult; +import com.pamirs.pradar.pressurement.agent.listener.PradarEventListener; +import com.pamirs.pradar.pressurement.agent.shared.service.EventRouter; +import com.pamirs.pradar.pressurement.agent.shared.service.GlobalConfig; import com.pamirs.pradar.script.ScriptEvaluator; +import com.pamirs.pradar.script.commons.InterpreterWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.StringReader; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; public class GlobalCacheBshScriptEvaluator implements ScriptEvaluator {