fix 修复oshi日志打印问题

tzfun · Dec 29, 2023 · ce67367 · ce67367
1 parent 2ad6f75
commit ce67367
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/agent/src/main/java/org/beifengtz/jvmm/agent/AgentBootStrap.java b/agent/src/main/java/org/beifengtz/jvmm/agent/AgentBootStrap.java
@@ -282,7 +282,7 @@ private static void notifyListener(int listenerPort, String message) {
 
     private static void bootServer(Instrumentation inst, List<URL> needPreLoad, String agentArgs) throws InterruptedException {
         //  启动日志打印代理消费线程
-//        runLoggerConsumer();
+        runLoggerConsumer();
         running = true;
         bindThread = new Thread(() -> {
             int listenerPort = findListenerPortFromArgs(agentArgs);

diff --git a/convey/src/main/java/org/beifengtz/jvmm/convey/handler/JvmmChannelHandler.java b/convey/src/main/java/org/beifengtz/jvmm/convey/handler/JvmmChannelHandler.java
@@ -336,7 +336,7 @@ protected void handleException(ChannelHandlerContext ctx, JvmmRequest req, Throw
                 .setType(req.getType())
                 .setContextId(req.getContextId());
         if (e instanceof IllegalArgumentException) {
-            logger().error("Handle jvmm request failed: " + e.getMessage(), e);
+            logger().warn("Handle jvmm request failed: " + e.getMessage(), logger().isDebugEnabled() ? e : null);
             response.setStatus(RpcStatus.JVMM_STATUS_ILLEGAL_ARGUMENTS).setMessage(e.getMessage());
         } else {
             logger().error(e.getMessage(), e);

diff --git a/core/build.gradle b/core/build.gradle
@@ -15,7 +15,9 @@ dependencies {
     compile(project(':common'))
     compileOnly(files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs()))
     compile "org.benf:cfr:${cfrVersion}"
-    compile "com.github.oshi:oshi-core:${oshiVersion}"
+    compile("com.github.oshi:oshi-core:${oshiVersion}") {
+        exclude group: 'org.slf4j'
+    }
 }
 
 jar {
@@ -48,7 +50,7 @@ artifacts {
     archives sourcesJar, javadocJar
 }
 
-if(env == 'publish') {
+if (env == 'publish') {
     uploadArchives {
         repositories {
             mavenDeployer {
@@ -95,4 +97,4 @@ if(env == 'publish') {
     signing {
         sign configurations.archives
     }
-}
+}
diff --git a/logger/build.gradle b/logger/build.gradle
@@ -11,7 +11,7 @@ version = rootProject.version
 
 dependencies {
     compile(project(":common"))
-    compileOnly "org.slf4j:slf4j-api:1.7.30"
+    compile "org.slf4j:slf4j-api:1.7.36"
 }
 
 jar {
@@ -91,4 +91,4 @@ if(env == 'publish') {
     signing {
         sign configurations.archives
     }
-}
+}
diff --git a/logger/src/main/java/org/beifengtz/jvmm/log/JvmmLoggerFactory.java b/logger/src/main/java/org/beifengtz/jvmm/log/JvmmLoggerFactory.java
@@ -97,10 +97,13 @@ public void updatePrinters() {
         String ps = config.getPrinters();
         for (String p : ps.split(",")) {
             if ("std".equalsIgnoreCase(p.trim())) {
+                System.out.println("Use std printer");
                 printers.add(new StdPrinter());
             } else if ("file".equalsIgnoreCase(p.trim())) {
+                System.out.println("Use file printer");
                 printers.add(new FilePrinter(config));
             } else if ("agentProxy".equalsIgnoreCase(p.trim())) {
+                System.out.println("Use agent proxy printer");
                 printers.add(new AgentProxyPrinter());
             }
         }

diff --git a/server/src/main/java/org/beifengtz/jvmm/server/ServerBootstrap.java b/server/src/main/java/org/beifengtz/jvmm/server/ServerBootstrap.java
@@ -83,10 +83,10 @@ public synchronized static ServerBootstrap getInstance(Instrumentation inst, Con
         }
         ServerContext.setConfiguration(config);
 
-//        if (ServerContext.isFromAgent()) {
+        if (ServerContext.isFromAgent()) {
             //  如果从agent启动，则取消默认的标注输出和文件输出
-//            System.setProperty(SystemPropertyUtil.PROPERTY_JVMM_LOG_PRINTERS, "agentProxy");
-//        }
+            System.setProperty(SystemPropertyUtil.PROPERTY_JVMM_LOG_PRINTERS, "agentProxy");
+        }
 
         try {
             ServerContext.loadLoggerLib();