Fixed the bug that logStrategy=NONE will still print a blank line of …

…logs
LianjiaTech · Jun 1, 2024 · 541777f · 541777f
1 parent 0335ad9
commit 541777f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ gitee项目地址：[https://gitee.com/lianjiatech/retrofit-spring-boot-starter]
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>3.1.0</version>
+   <version>3.1.1</version>
 </dependency>
 ```
 

diff --git a/README_EN.md b/README_EN.md
@@ -41,7 +41,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>3.1.0</version>
+   <version>3.1.1</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>

diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/log/LoggingInterceptor.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/log/LoggingInterceptor.java
@@ -29,8 +29,11 @@ public Response intercept(Chain chain) throws IOException {
         if (!needLog(logging)) {
             return chain.proceed(chain.request());
         }
-        LogLevel logLevel = logging == null ? globalLogProperty.getLogLevel() : logging.logLevel();
         LogStrategy logStrategy = logging == null ? globalLogProperty.getLogStrategy() : logging.logStrategy();
+        if (logStrategy == LogStrategy.NONE) {
+            return chain.proceed(chain.request());
+        }
+        LogLevel logLevel = logging == null ? globalLogProperty.getLogLevel() : logging.logLevel();
         boolean aggregate = logging == null ? globalLogProperty.isAggregate() : logging.aggregate();
         HttpLoggingInterceptor.Logger matchLogger = matchLogger(logLevel);
         HttpLoggingInterceptor.Logger logger = aggregate ? new BufferingLogger(matchLogger) : matchLogger;