From 784ec442e51a1b56765f23835747b120bf6619ef Mon Sep 17 00:00:00 2001 From: hengyunabc Date: Thu, 19 Sep 2019 19:14:44 +0800 Subject: [PATCH] logger command print AsyncAppender blocking info #862 --- .../com/taobao/arthas/core/command/logger/Log4jHelper.java | 1 + .../com/taobao/arthas/core/command/logger/LogbackHelper.java | 1 + .../com/taobao/arthas/core/command/logger/LoggerCommand.java | 3 +++ .../com/taobao/arthas/core/command/logger/LoggerHelper.java | 1 + 4 files changed, 6 insertions(+) diff --git a/core/src/main/java/com/taobao/arthas/core/command/logger/Log4jHelper.java b/core/src/main/java/com/taobao/arthas/core/command/logger/Log4jHelper.java index 055318f76..1f1cf7bee 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/logger/Log4jHelper.java +++ b/core/src/main/java/com/taobao/arthas/core/command/logger/Log4jHelper.java @@ -146,6 +146,7 @@ public class Log4jHelper { appenderRef.add((String) a.get(LoggerHelper.name)); result.add(a); } + info.put(LoggerHelper.blocking, ((AsyncAppender) appender).getBlocking()); info.put(LoggerHelper.appenderRef, appenderRef); } } diff --git a/core/src/main/java/com/taobao/arthas/core/command/logger/LogbackHelper.java b/core/src/main/java/com/taobao/arthas/core/command/logger/LogbackHelper.java index 53fc16f03..d860a700d 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/logger/LogbackHelper.java +++ b/core/src/main/java/com/taobao/arthas/core/command/logger/LogbackHelper.java @@ -153,6 +153,7 @@ public class LogbackHelper { result.add(a); } info.put(LoggerHelper.appenderRef, appenderRef); + info.put(LoggerHelper.blocking, !aa.isNeverBlock()); } else if (appender instanceof ConsoleAppender) { info.put(LoggerHelper.target, ((ConsoleAppender) appender).getTarget()); } diff --git a/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerCommand.java b/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerCommand.java index 66a9c0ea8..7bfef8a7a 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerCommand.java @@ -251,6 +251,9 @@ public class LoggerCommand extends AnnotatedCommand { appendersTable.row(label(LoggerHelper.target), label("" + appenderInfo.get(LoggerHelper.target))); } + if (appenderInfo.get(LoggerHelper.blocking) != null) { + appendersTable.row(label(LoggerHelper.blocking), label("" + appenderInfo.get(LoggerHelper.blocking))); + } if (appenderInfo.get(LoggerHelper.appenderRef) != null) { appendersTable.row(label(LoggerHelper.appenderRef), label("" + appenderInfo.get(LoggerHelper.appenderRef))); diff --git a/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerHelper.java b/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerHelper.java index 78aa8ff24..e1180a08b 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerHelper.java +++ b/core/src/main/java/com/taobao/arthas/core/command/logger/LoggerHelper.java @@ -21,6 +21,7 @@ public interface LoggerHelper { // appender info public static final String name = "name"; public static final String file = "file"; + public static final String blocking = "blocking"; // type List public static final String appenderRef = "appenderRef"; public static final String target = "target";