From 623ad8b696d5af08fb30812fb5020c2073485493 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Thu, 25 Jan 2024 18:07:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(all):=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml                | 9 +++++----
 .../src/main/resources/logback-spring.xml                | 9 +++++----
 .../src/main/resources/logback-spring.xml                | 9 +++++----
 service-gateway/src/main/resources/logback-spring.xml    | 9 +++++----
 service-hudi-query/src/main/resources/logback-spring.xml | 9 +++++----
 service-info-query/src/main/resources/logback-spring.xml | 9 +++++----
 service-loki-query/src/main/resources/logback-spring.xml | 9 +++++----
 .../src/main/resources/logback-spring.xml                | 9 +++++----
 service-queue/src/main/resources/logback-spring.xml      | 9 +++++----
 service-uploader/src/main/resources/logback-spring.xml   | 9 +++++----
 service-web/src/main/resources/logback-spring.xml        | 9 +++++----
 service-yarn-query/src/main/resources/logback-spring.xml | 9 +++++----
 .../src/main/resources/logback-spring.xml                | 9 +++++----
 13 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/service-cloud-query/src/main/resources/logback-spring.xml b/service-cloud-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-cloud-query/src/main/resources/logback-spring.xml
+++ b/service-cloud-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-executor/service-executor-manager/src/main/resources/logback-spring.xml b/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
+++ b/service-executor/service-executor-manager/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-flink-query/src/main/resources/logback-spring.xml b/service-flink-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-flink-query/src/main/resources/logback-spring.xml
+++ b/service-flink-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-gateway/src/main/resources/logback-spring.xml b/service-gateway/src/main/resources/logback-spring.xml
index fa5015b..1ada863 100644
--- a/service-gateway/src/main/resources/logback-spring.xml
+++ b/service-gateway/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-hudi-query/src/main/resources/logback-spring.xml b/service-hudi-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-hudi-query/src/main/resources/logback-spring.xml
+++ b/service-hudi-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-info-query/src/main/resources/logback-spring.xml b/service-info-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-info-query/src/main/resources/logback-spring.xml
+++ b/service-info-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-loki-query/src/main/resources/logback-spring.xml b/service-loki-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-loki-query/src/main/resources/logback-spring.xml
+++ b/service-loki-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-pulsar-query/src/main/resources/logback-spring.xml b/service-pulsar-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-pulsar-query/src/main/resources/logback-spring.xml
+++ b/service-pulsar-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-queue/src/main/resources/logback-spring.xml b/service-queue/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-queue/src/main/resources/logback-spring.xml
+++ b/service-queue/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-uploader/src/main/resources/logback-spring.xml b/service-uploader/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-uploader/src/main/resources/logback-spring.xml
+++ b/service-uploader/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-web/src/main/resources/logback-spring.xml b/service-web/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-web/src/main/resources/logback-spring.xml
+++ b/service-web/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-yarn-query/src/main/resources/logback-spring.xml b/service-yarn-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-yarn-query/src/main/resources/logback-spring.xml
+++ b/service-yarn-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
diff --git a/service-zookeeper-query/src/main/resources/logback-spring.xml b/service-zookeeper-query/src/main/resources/logback-spring.xml
index 62ded51..5b0fdbd 100644
--- a/service-zookeeper-query/src/main/resources/logback-spring.xml
+++ b/service-zookeeper-query/src/main/resources/logback-spring.xml
@@ -14,10 +14,11 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:- },host=${HOSTNAME},level=%level</pattern>
+                <pattern>app=${APP_NAME},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
             </label>
             <message>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
             </message>
             <sortByTime>true</sortByTime>
         </format>
@@ -25,7 +26,7 @@
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} [%X{EXTRA_LOG:-}] %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %clr(%5p) %clr([${HOSTNAME}]){yellow} %clr([%t]){magenta} %clr(%logger{40}){cyan} #@# %m%n%wEx</pattern>
         </encoder>
     </appender>
 
@@ -36,7 +37,7 @@
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%X{EXTRA_LOG:-}] [%t] %logger #@# %m%n%wEx</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %p [${HOSTNAME}] [%t] %logger #@# %m%n%wEx</pattern>
         </encoder>
     </appender>