From 47caa91e85dbfd1ae84ce763f862b7ac89064262 Mon Sep 17 00:00:00 2001 From: Yotam Date: Wed, 2 Feb 2022 21:04:19 +0200 Subject: [PATCH] fix(cli): fix and add debug log messages in initialization phase (PR #1362) * Fix log level settings in the CLI * Add log messages in initialization phase --- jadx-cli/src/main/java/jadx/cli/LogHelper.java | 2 +- jadx-core/src/main/java/jadx/api/JadxDecompiler.java | 1 + .../src/main/java/jadx/api/plugins/JadxPluginManager.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jadx-cli/src/main/java/jadx/cli/LogHelper.java b/jadx-cli/src/main/java/jadx/cli/LogHelper.java index 95bc796b5..2dbc273d5 100644 --- a/jadx-cli/src/main/java/jadx/cli/LogHelper.java +++ b/jadx-cli/src/main/java/jadx/cli/LogHelper.java @@ -54,7 +54,7 @@ public class LogHelper { Logger rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); rootLogger.setLevel(logLevel.getLevel()); - if (logLevel != LogLevelEnum.QUIET) { + if (logLevel == LogLevelEnum.PROGRESS) { // show progress for all levels except quiet setLevelForClass(JadxCLI.class, Level.INFO); setLevelForClass(JadxDecompiler.class, Level.INFO); diff --git a/jadx-core/src/main/java/jadx/api/JadxDecompiler.java b/jadx-core/src/main/java/jadx/api/JadxDecompiler.java index be1f227f9..346c0eba5 100644 --- a/jadx-core/src/main/java/jadx/api/JadxDecompiler.java +++ b/jadx-core/src/main/java/jadx/api/JadxDecompiler.java @@ -128,6 +128,7 @@ public final class JadxDecompiler implements Closeable { loadedInputs.add(loadResult); } } + LOG.debug("Loaded using {} inputs plugin", loadedInputs.size()); } private void reset() { diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java b/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java index 576302e9c..488f5cc69 100644 --- a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java +++ b/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java @@ -39,6 +39,7 @@ public class JadxPluginManager { ServiceLoader jadxPlugins = ServiceLoader.load(JadxPlugin.class); for (JadxPlugin plugin : jadxPlugins) { addPlugin(plugin); + LOG.debug("Loading plugin: {}", plugin.getPluginInfo().getPluginId()); } resolve(); }