This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 4cefb573c3 [Improve] Optimize log display during startup command
(#6816)
4cefb573c3 is described below
commit 4cefb573c3eca4305634be3bf60581e990fa1ad2
Author: seckiller <[email protected]>
AuthorDate: Wed May 15 10:01:25 2024 +0800
[Improve] Optimize log display during startup command (#6816)
Co-authored-by: JohnZp <[email protected]>
---
seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd | 2 +-
seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.sh | 2 +-
seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd | 2 +-
seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd
b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd
index e94a4bb482..067646730d 100644
--- a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd
+++ b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd
@@ -62,7 +62,7 @@ REM port in your IDE. After that, you can happily debug your
code.
REM set "JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:server=y,transport=dt_socket,address=5001,suspend=y"
if exist "%CONF_DIR%\log4j2.properties" (
- set "JAVA_OPTS=%JAVA_OPTS%
-Dlog4j2.configurationFile=%CONF_DIR%\log4j2.properties"
+ set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.logging.type=log4j2
-Dlog4j2.configurationFile=%CONF_DIR%\log4j2.properties"
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.path=%APP_DIR%\logs"
set "JAVA_OPTS=%JAVA_OPTS%
-Dseatunnel.logs.file_name=seatunnel-engine-server"
)
diff --git a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.sh
b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.sh
index 1eda5a15e1..e6e48123c7 100755
--- a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.sh
+++ b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.sh
@@ -84,7 +84,7 @@ JAVA_OPTS="${JAVA_OPTS}
-Dhazelcast.config=${HAZELCAST_CONFIG}"
# Log4j2 Config
JAVA_OPTS="${JAVA_OPTS}
-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
if [ -e "${CONF_DIR}/log4j2.properties" ]; then
- JAVA_OPTS="${JAVA_OPTS}
-Dlog4j2.configurationFile=${CONF_DIR}/log4j2.properties"
+ JAVA_OPTS="${JAVA_OPTS} -Dhazelcast.logging.type=log4j2
-Dlog4j2.configurationFile=${CONF_DIR}/log4j2.properties"
JAVA_OPTS="${JAVA_OPTS} -Dseatunnel.logs.path=${APP_DIR}/logs"
JAVA_OPTS="${JAVA_OPTS} -Dseatunnel.logs.file_name=seatunnel-engine-server"
fi
diff --git a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd
b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd
index cf9258e9d5..20e253847a 100644
--- a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd
+++ b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd
@@ -77,7 +77,7 @@ REM set "JAVA_OPTS=%JAVA_OPTS% -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,ad
REM Log4j2 Config
if exist "%CONF_DIR%\log4j2_client.properties" (
- set "JAVA_OPTS=%JAVA_OPTS%
-Dlog4j2.configurationFile=%CONF_DIR%\log4j2_client.properties"
+ set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.logging.type=log4j2
-Dlog4j2.configurationFile=%CONF_DIR%\log4j2_client.properties"
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.path=%APP_DIR%\logs"
for %%i in (%args%) do (
set "arg=%%i"
diff --git a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
index e7754e3975..644ec02eae 100755
--- a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
+++ b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.sh
@@ -89,7 +89,7 @@ JAVA_OPTS="${JAVA_OPTS}
-Dhazelcast.config=${HAZELCAST_CONFIG}"
# Log4j2 Config
if [ -e "${CONF_DIR}/log4j2_client.properties" ]; then
- JAVA_OPTS="${JAVA_OPTS}
-Dlog4j2.configurationFile=${CONF_DIR}/log4j2_client.properties"
+ JAVA_OPTS="${JAVA_OPTS} -Dhazelcast.logging.type=log4j2
-Dlog4j2.configurationFile=${CONF_DIR}/log4j2_client.properties"
JAVA_OPTS="${JAVA_OPTS} -Dseatunnel.logs.path=${APP_DIR}/logs"
if [[ $args == *" -m local"* || $args == *" --master local"* || $args == *"
-e local"* || $args == *" --deploy-mode local"* ]]; then
ntime=$(echo `date "+%N"`|sed -r 's/^0+//')
