perf($Logback): simplify CONSOLE log format

johnnymillergh · Sep 22, 2021 · e6bf0e6 · e6bf0e6
1 parent 4b40ac2
commit e6bf0e6
Show file tree

Hide file tree

Showing 31 changed files with 113 additions and 114 deletions.
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-base.xml b/api-gateway/src/main/resources/logback-configuration/logback-base.xml
@@ -12,9 +12,9 @@
     <!-- Log Render Configuration -->
     <springProperty scope="context" name="APPLICATION" source="spring.application.name"/>
     <property name="CONSOLE_LOG_PATTERN"
-              value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr(${PID:- }){magenta} - [%15.15t] %-48.48logger{48} : %msg%n%wEx"/>
     <property name="FILE_LOG_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %msg%n%wEx"/>
     <!-- Log home is nothing related with Spring profiles or environments -->
     <property name="LOG_HOME" value="logs"/>
 
@@ -40,28 +40,26 @@
         <property name="LOGSTASH_HOST" value="maf-logstash"/>
     </springProfile>
 
-    <!-- CONSOLE Log Configuration -->
+    <!-- Async CONSOLE Log Configuration -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
         </encoder>
     </appender>
-
     <!-- https://examples.javacodegeeks.com/enterprise-java/logback/logback-ayncappender-example/ -->
     <appender name="ASYNC_CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="CONSOLE"/>
-        <!-- default 256 -->
+        <!-- default 20, means drop lower event when has 20% capacity remaining. To keep all events, set discardingThreshold to 0. -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- The maximum capacity of the blocking queue. By default, queueSize is set to 256. -->
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
         <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
         <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- FILE Log Configuration -->
+    <!-- Async FILE Log Configuration -->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ALL</level>
@@ -86,24 +84,26 @@
             <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
     </appender>
-
     <appender name="ASYNC_FILE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="FILE"/>
-        <!-- default 256 -->
+        <discardingThreshold>0</discardingThreshold>
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
-        <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
-        <neverBlock>false</neverBlock>
+        <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- LOGSTASH -->
+    <!-- Async Logstash -->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>${LOGSTASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"applicationName": "${APPLICATION}", "environment": "${ENVIRONMENT}"}</customFields>
         </encoder>
     </appender>
+    <appender name="ASYNC_LOGSTASH" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="LOGSTASH"/>
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>false</includeCallerData>
+        <neverBlock>true</neverBlock>
+    </appender>
 </included>
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-development-docker.xml b/api-gateway/src/main/resources/logback-configuration/logback-development-docker.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-development-local.xml b/api-gateway/src/main/resources/logback-configuration/logback-development-local.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-production.xml b/api-gateway/src/main/resources/logback-configuration/logback-production.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-stage.xml b/api-gateway/src/main/resources/logback-configuration/logback-stage.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/api-gateway/src/main/resources/logback-configuration/logback-test.xml b/api-gateway/src/main/resources/logback-configuration/logback-test.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java
@@ -8,7 +8,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Description: OssConfiguration, change description here.
@@ -24,9 +23,9 @@ public class OssConfiguration {
     @Bean
     public OssUploader ossUploader() {
         return (name, inputStream) -> {
-            MultipartFile file = new MockMultipartFile(name, name, null, inputStream);
-            val response = this.ossCenterRemoteApi.uploadSingleResource(file);
-            log.info("Called {} to upload file. {}", OssCenterRemoteApi.SERVICE_NAME, response);
+            val multipartFile = new MockMultipartFile(name, name, null, inputStream);
+            val response = this.ossCenterRemoteApi.uploadSingleResource(multipartFile);
+            log.info("Called {} to upload multipartFile. {}", OssCenterRemoteApi.SERVICE_NAME, response);
             return String.format("%s/%s", response.getData().getBucket(), response.getData().getObject());
         };
     }

diff --git a/auth-center/src/main/resources/logback-configuration/logback-base.xml b/auth-center/src/main/resources/logback-configuration/logback-base.xml
@@ -12,9 +12,9 @@
     <!-- Log Render Configuration -->
     <springProperty scope="context" name="APPLICATION" source="spring.application.name"/>
     <property name="CONSOLE_LOG_PATTERN"
-              value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr(${PID:- }){magenta} - [%15.15t] %-48.48logger{48} : %msg%n%wEx"/>
     <property name="FILE_LOG_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %msg%n%wEx"/>
     <!-- Log home is nothing related with Spring profiles or environments -->
     <property name="LOG_HOME" value="logs"/>
 
@@ -40,28 +40,26 @@
         <property name="LOGSTASH_HOST" value="maf-logstash"/>
     </springProfile>
 
-    <!-- CONSOLE Log Configuration -->
+    <!-- Async CONSOLE Log Configuration -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
         </encoder>
     </appender>
-
     <!-- https://examples.javacodegeeks.com/enterprise-java/logback/logback-ayncappender-example/ -->
     <appender name="ASYNC_CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="CONSOLE"/>
-        <!-- default 256 -->
+        <!-- default 20, means drop lower event when has 20% capacity remaining. To keep all events, set discardingThreshold to 0. -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- The maximum capacity of the blocking queue. By default, queueSize is set to 256. -->
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
         <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
         <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- FILE Log Configuration -->
+    <!-- Async FILE Log Configuration -->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ALL</level>
@@ -86,24 +84,26 @@
             <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
     </appender>
-
     <appender name="ASYNC_FILE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="FILE"/>
-        <!-- default 256 -->
+        <discardingThreshold>0</discardingThreshold>
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
-        <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
-        <neverBlock>false</neverBlock>
+        <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- LOGSTASH -->
+    <!-- Async Logstash -->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>${LOGSTASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"applicationName": "${APPLICATION}", "environment": "${ENVIRONMENT}"}</customFields>
         </encoder>
     </appender>
+    <appender name="ASYNC_LOGSTASH" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="LOGSTASH"/>
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>false</includeCallerData>
+        <neverBlock>true</neverBlock>
+    </appender>
 </included>
diff --git a/auth-center/src/main/resources/logback-configuration/logback-development-docker.xml b/auth-center/src/main/resources/logback-configuration/logback-development-docker.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/auth-center/src/main/resources/logback-configuration/logback-development-local.xml b/auth-center/src/main/resources/logback-configuration/logback-development-local.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/auth-center/src/main/resources/logback-configuration/logback-production.xml b/auth-center/src/main/resources/logback-configuration/logback-production.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/auth-center/src/main/resources/logback-configuration/logback-stage.xml b/auth-center/src/main/resources/logback-configuration/logback-stage.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/auth-center/src/main/resources/logback-configuration/logback-test.xml b/auth-center/src/main/resources/logback-configuration/logback-test.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-base.xml b/maf-mis/src/main/resources/logback-configuration/logback-base.xml
@@ -12,9 +12,9 @@
     <!-- Log Render Configuration -->
     <springProperty scope="context" name="APPLICATION" source="spring.application.name"/>
     <property name="CONSOLE_LOG_PATTERN"
-              value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr(${PID:- }){magenta} - [%15.15t] %-48.48logger{48} : %msg%n%wEx"/>
     <property name="FILE_LOG_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %msg%n%wEx"/>
     <!-- Log home is nothing related with Spring profiles or environments -->
     <property name="LOG_HOME" value="logs"/>
 
@@ -40,28 +40,26 @@
         <property name="LOGSTASH_HOST" value="maf-logstash"/>
     </springProfile>
 
-    <!-- CONSOLE Log Configuration -->
+    <!-- Async CONSOLE Log Configuration -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
         </encoder>
     </appender>
-
     <!-- https://examples.javacodegeeks.com/enterprise-java/logback/logback-ayncappender-example/ -->
     <appender name="ASYNC_CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="CONSOLE"/>
-        <!-- default 256 -->
+        <!-- default 20, means drop lower event when has 20% capacity remaining. To keep all events, set discardingThreshold to 0. -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- The maximum capacity of the blocking queue. By default, queueSize is set to 256. -->
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
         <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
         <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- FILE Log Configuration -->
+    <!-- Async FILE Log Configuration -->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ALL</level>
@@ -86,24 +84,26 @@
             <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
     </appender>
-
     <appender name="ASYNC_FILE" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- default 20, means drop lower event when has 20% capacity remaining -->
-        <discardingThreshold>0</discardingThreshold>
         <appender-ref ref="FILE"/>
-        <!-- default 256 -->
+        <discardingThreshold>0</discardingThreshold>
         <queueSize>256</queueSize>
-        <!-- default false -->
         <includeCallerData>false</includeCallerData>
-        <!-- default false, set to true to cause the Appender not block the application and just drop the messages -->
-        <neverBlock>false</neverBlock>
+        <neverBlock>true</neverBlock>
     </appender>
 
-    <!-- LOGSTASH -->
+    <!-- Async Logstash -->
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>${LOGSTASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"applicationName": "${APPLICATION}", "environment": "${ENVIRONMENT}"}</customFields>
         </encoder>
     </appender>
+    <appender name="ASYNC_LOGSTASH" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="LOGSTASH"/>
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>false</includeCallerData>
+        <neverBlock>true</neverBlock>
+    </appender>
 </included>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-development-docker.xml b/maf-mis/src/main/resources/logback-configuration/logback-development-docker.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-development-local.xml b/maf-mis/src/main/resources/logback-configuration/logback-development-local.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-production.xml b/maf-mis/src/main/resources/logback-configuration/logback-production.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-stage.xml b/maf-mis/src/main/resources/logback-configuration/logback-stage.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>
diff --git a/maf-mis/src/main/resources/logback-configuration/logback-test.xml b/maf-mis/src/main/resources/logback-configuration/logback-test.xml
@@ -6,6 +6,6 @@
     <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+        <appender-ref ref="ASYNC_LOGSTASH"/>
     </root>
 </configuration>