(amoro) branch master updated: [AMORO-3098] Load log4j2.xml under AMORO_CONF_DIR first (#3099)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new bc0034a51 [AMORO-3098] Load log4j2.xml under AMORO_CONF_DIR first 
(#3099)
bc0034a51 is described below

commit bc0034a519865701676d9f5ff5e545f6c6b637c7
Author: ZhouJinsong <zhoujinsong0...@163.com>
AuthorDate: Thu Aug 15 20:22:19 2024 +0800

    [AMORO-3098] Load log4j2.xml under AMORO_CONF_DIR first (#3099)
    
    Load log4j2.xml under AMORO_CONF_DIR first
---
 amoro-ams/dist/src/main/amoro-bin/bin/ams.sh         | 4 ++--
 amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/amoro-ams/dist/src/main/amoro-bin/bin/ams.sh 
b/amoro-ams/dist/src/main/amoro-bin/bin/ams.sh
index 673f7582b..22115875d 100644
--- a/amoro-ams/dist/src/main/amoro-bin/bin/ams.sh
+++ b/amoro-ams/dist/src/main/amoro-bin/bin/ams.sh
@@ -82,8 +82,8 @@ if [ -z "$JAVA_OPTS" ]; then
 fi
 
 
-export CLASSPATH=$AMORO_CONF_DIR:$LIB_PATH/:$(find $LIB_PATH/ -type f -name 
"*.jar" | sort | paste -sd':' -)
-CMDS="$JAVA_RUN -Dlog.home=${AMORO_LOG_DIR} -Dlog.dir=${AMORO_LOG_DIR} 
-Duser.dir=${AMORO_HOME}  $JAVA_OPTS ${RUN_SERVER}"
+export CLASSPATH=$AMORO_HOME/conf:$AMORO_CONF_DIR:$LIB_PATH/:$(find $LIB_PATH/ 
-type f -name "*.jar" | sort | paste -sd':' -)
+CMDS="$JAVA_RUN -Dlog4j.configurationFile=${AMORO_LOG_CONF_FILE} 
-Dlog.home=${AMORO_LOG_DIR} -Dlog.dir=${AMORO_LOG_DIR} -Duser.dir=${AMORO_HOME} 
 $JAVA_OPTS ${RUN_SERVER}"
 #0:pid bad and proc OK;   1:pid ok and proc bad;    2:pid bad
 function status(){
     test -e ${PID} || return 2
diff --git a/amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh 
b/amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh
index f4f5860cc..1f5311c5e 100644
--- a/amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh
+++ b/amoro-ams/dist/src/main/amoro-bin/bin/load-config.sh
@@ -34,8 +34,9 @@ fi
 if [ -z "$AMORO_CONF_DIR" ]; then
     export AMORO_CONF_DIR="${AMORO_HOME}/conf"
 fi
-
-
+if [ -z "$AMORO_LOG_CONF_FILE" ]; then
+    export AMORO_LOG_CONF_FILE="${AMORO_CONF_DIR}/log4j2.xml"
+fi
 
 JVM_PROPERTIES=${AMORO_CONF_DIR}/jvm.properties
 JVM_VALUE=