PullRequest: 188 hotfix/logback-to-log4j2

Merge branch 'hotfix/logback-to-log4j2 of [email protected]:sofa-open/sofa-registry.git into EI61836181_20201222 https://code.alipay.com/sofa-open/sofa-registry/pull_requests/188 Signed-off-by: 源三 <[email protected]> * change logback to log4j2 * remove all logback except client
sofastack · Feb 8, 2021 · 4d257fa · 4d257fa
1 parent 5ab5d33
commit 4d257fa
Show file tree

Hide file tree

Showing 34 changed files with 1,753 additions and 2,527 deletions.
diff --git a/server/distribution/data/bin/startup.bat b/server/distribution/data/bin/startup.bat
@@ -28,7 +28,7 @@ rem set user.home
 set "JAVA_OPT=%JAVA_OPT% -Duser.home=%BASE_DIR%"
 
 rem springboot conf
-set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% --logging.config=%BASE_DIR%\conf\logback-spring.xml"
+set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=%BASE_DIR%\conf\log4j2.xml -Dlog4j.configurationFile=%BASE_DIR%\conf\log4j2.xml"
 
 rem heap size
 set HEAP_MAX=512

diff --git a/server/distribution/data/bin/startup.sh b/server/distribution/data/bin/startup.sh
@@ -26,7 +26,7 @@ JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=${BASE_DIR}/conf/application.prop
 JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR}"
 
 # springboot conf
-SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
+SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=${BASE_DIR}/conf/log4j2.xml -Dlog4j.configurationFile=${BASE_DIR}/conf/log4j2.xml"
 
 # heap size
 HEAP_MAX=512

diff --git a/server/distribution/data/distribution-data.xml b/server/distribution/data/distribution-data.xml
@@ -26,9 +26,9 @@
             <destName>registry-data.jar</destName>
         </file>
         <file>
-            <source>../../server/data/src/main/resources/logback-spring.xml</source>
+            <source>../../server/data/src/main/resources/log4j2.xml</source>
             <outputDirectory>./conf</outputDirectory>
-            <destName>logback-spring.xml</destName>
+            <destName>log4j2.xml</destName>
         </file>
         <file>
             <source>../version</source>

diff --git a/server/distribution/integration/bin/startup.bat b/server/distribution/integration/bin/startup.bat
@@ -28,7 +28,7 @@ rem set user.home
 set "JAVA_OPT=%JAVA_OPT% -Duser.home=%BASE_DIR%"
 
 rem springboot conf
-set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% --logging.config=%BASE_DIR%\conf\logback-spring.xml"
+set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=%BASE_DIR%\conf\log4j2.xml -Dlog4j.configurationFile=%BASE_DIR%\conf\log4j2.xml"
 
 rem heap size
 set HEAP_MAX=512

diff --git a/server/distribution/integration/bin/startup.sh b/server/distribution/integration/bin/startup.sh
@@ -26,7 +26,7 @@ JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=${BASE_DIR}/conf/application.prop
 JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR}"
 
 # springboot conf
-SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
+SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=${BASE_DIR}/conf/log4j2.xml -Dlog4j.configurationFile=${BASE_DIR}/conf/log4j2.xml"
 
 # heap size
 HEAP_MAX=512

diff --git a/server/distribution/integration/distribution-integration.xml b/server/distribution/integration/distribution-integration.xml
@@ -26,9 +26,9 @@
             <destName>registry-integration.jar</destName>
         </file>
         <file>
-            <source>../../server/integration/src/main/resources/logback-spring.xml</source>
+            <source>../../server/integration/src/main/resources/log4j2.xml</source>
             <outputDirectory>./conf</outputDirectory>
-            <destName>logback-spring.xml</destName>
+            <destName>log4j2.xml</destName>
         </file>
         <file>
             <source>../version</source>

diff --git a/server/distribution/meta/bin/startup.bat b/server/distribution/meta/bin/startup.bat
@@ -28,7 +28,7 @@ rem set user.home
 set "JAVA_OPT=%JAVA_OPT% -Duser.home=%BASE_DIR%"
 
 rem springboot conf
-set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% --logging.config=%BASE_DIR%\conf\logback-spring.xml"
+set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=%BASE_DIR%\conf\log4j2.xml -Dlog4j.configurationFile=%BASE_DIR%\conf\log4j2.xml"
 
 rem heap size
 set HEAP_MAX=512

diff --git a/server/distribution/meta/bin/startup.sh b/server/distribution/meta/bin/startup.sh
@@ -26,7 +26,7 @@ JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=${BASE_DIR}/conf/application.prop
 JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR}"
 
 # springboot conf
-SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
+SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=${BASE_DIR}/conf/log4j2.xml -Dlog4j.configurationFile=${BASE_DIR}/conf/log4j2.xml"
 
 # heap size
 HEAP_MAX=512

diff --git a/server/distribution/meta/distribution-meta.xml b/server/distribution/meta/distribution-meta.xml
@@ -26,9 +26,9 @@
             <destName>registry-meta.jar</destName>
         </file>
         <file>
-            <source>../../server/meta/src/main/resources/logback-spring.xml</source>
+            <source>../../server/meta/src/main/resources/log4j2.xml</source>
             <outputDirectory>./conf</outputDirectory>
-            <destName>logback-spring.xml</destName>
+            <destName>log4j2.xml</destName>
         </file>
         <file>
             <source>../version</source>

diff --git a/server/distribution/session/bin/startup.bat b/server/distribution/session/bin/startup.bat
@@ -28,7 +28,7 @@ rem set user.home
 set "JAVA_OPT=%JAVA_OPT% -Duser.home=%BASE_DIR%"
 
 rem springboot conf
-set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% --logging.config=%BASE_DIR%\conf\logback-spring.xml"
+set "SPRINGBOOT_OPTS=%SPRINGBOOT_OPTS% -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=%BASE_DIR%\conf\log4j2.xml -Dlog4j.configurationFile=%BASE_DIR%\conf\log4j2.xml"
 
 rem heap size
 set HEAP_MAX=512

diff --git a/server/distribution/session/bin/startup.sh b/server/distribution/session/bin/startup.sh
@@ -26,7 +26,7 @@ JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=${BASE_DIR}/conf/application.prop
 JAVA_OPTS="$JAVA_OPTS -Duser.home=${BASE_DIR}"
 
 # springboot conf
-SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
+SPRINGBOOT_OPTS="${SPRINGBOOT_OPTS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -Dlogging.config=${BASE_DIR}/conf/log4j2.xml -Dlog4j.configurationFile=${BASE_DIR}/conf/log4j2.xml"
 
 # heap size
 HEAP_MAX=512

diff --git a/server/distribution/session/distribution-session.xml b/server/distribution/session/distribution-session.xml
@@ -26,9 +26,9 @@
             <destName>registry-session.jar</destName>
         </file>
         <file>
-            <source>../../server/session/src/main/resources/logback-spring.xml</source>
+            <source>../../server/session/src/main/resources/log4j2.xml</source>
             <outputDirectory>./conf</outputDirectory>
-            <destName>logback-spring.xml</destName>
+            <destName>log4j2.xml</destName>
         </file>
         <file>
             <source>../version</source>

diff --git a/server/server/data/pom.xml b/server/server/data/pom.xml
@@ -17,10 +17,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <artifactId>registry-common-model</artifactId>
             <groupId>com.alipay.sofa</groupId>