From 8021b1c9f6a070f88bdbd3fe7eec825ff56b6aab Mon Sep 17 00:00:00 2001
From: halibobo1205 <halibobo1205@gmail.com>
Date: Tue, 4 Nov 2025 19:31:18 +0800
Subject: [PATCH] fix(log): restore logger context after test to prevent
 pollution

- Add StatusPrinter for error details in load()
- Restore default logger config in TronErrorTest
---
 .../java/org/tron/common/log/LogService.java  |  5 +++-
 .../tron/core/exception/TronErrorTest.java    | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/org/tron/common/log/LogService.java b/common/src/main/java/org/tron/common/log/LogService.java
index 801e13f54f7..bce52001e92 100644
--- a/common/src/main/java/org/tron/common/log/LogService.java
+++ b/common/src/main/java/org/tron/common/log/LogService.java
@@ -2,6 +2,7 @@
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.util.StatusPrinter;
 import java.io.File;
 import org.slf4j.LoggerFactory;
 import org.tron.core.exception.TronError;
@@ -9,18 +10,20 @@
 public class LogService {
 
   public static void load(String path) {
+    LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
     try {
       File file = new File(path);
       if (!file.exists() || !file.isFile() || !file.canRead()) {
         return;
       }
-      LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
       JoranConfigurator configurator = new JoranConfigurator();
       configurator.setContext(lc);
       lc.reset();
       configurator.doConfigure(file);
     } catch (Exception e) {
       throw new TronError(e, TronError.ErrCode.LOG_LOAD);
+    } finally {
+      StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
     }
   }
 }
diff --git a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java
index 53382ec265a..39fe1404b18 100644
--- a/framework/src/test/java/org/tron/core/exception/TronErrorTest.java
+++ b/framework/src/test/java/org/tron/core/exception/TronErrorTest.java
@@ -8,6 +8,9 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.core.joran.spi.JoranException;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigObject;
@@ -27,6 +30,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
 import org.tron.common.arch.Arch;
 import org.tron.common.log.LogService;
 import org.tron.common.parameter.RateLimiterInitialization;
@@ -38,6 +42,7 @@
 import org.tron.core.services.http.RateLimiterServlet;
 import org.tron.core.zen.ZksnarkInitService;
 
+
 @RunWith(MockitoJUnitRunner.class)
 public class TronErrorTest {
 
@@ -85,10 +90,22 @@ public void ZksnarkInitTest() throws IllegalAccessException, NoSuchFieldExceptio
 
   @Test
   public void LogLoadTest() throws IOException {
-    LogService.load("non-existent.xml");
-    Path path = temporaryFolder.newFile("logback.xml").toPath();
-    TronError thrown = assertThrows(TronError.class, () -> LogService.load(path.toString()));
-    assertEquals(TronError.ErrCode.LOG_LOAD, thrown.getErrCode());
+    LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+
+    try {
+      LogService.load("non-existent.xml");
+      Path path = temporaryFolder.newFile("logback.xml").toPath();
+      TronError thrown = assertThrows(TronError.class, () -> LogService.load(path.toString()));
+      assertEquals(TronError.ErrCode.LOG_LOAD, thrown.getErrCode());
+    } finally {
+      try {
+        context.reset();
+        ContextInitializer ci = new ContextInitializer(context);
+        ci.autoConfig();
+      } catch (JoranException e) {
+        Assert.fail(e.getMessage());
+      }
+    }
   }
 
   @Test