Skip to content

Commit 484750e

Browse files
FrommyMindFrommyMind
committed
fix JAVA_OPTS concate bug.
1 parent 9d201bb commit 484750e

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

‎seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-cluster.cmd

+16-14
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,26 @@ for %%I in (%*) do (
4646
set "JAVA_OPTS=%JvmOption%"
4747
set "SEATUNNEL_CONFIG=%CONF_DIR%\seatunnel.yaml"
4848

49-
set "JAVA_OPTS=%JAVA_OPTS% -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
50-
set "JAVA_OPTS=%JAVA_OPTS% -Dlog4j2.isThreadContextMapInheritable=true -DAsyncLogger.ThreadNameStrategy=UNCACHED"
49+
set "JAVA_OPTS=!JAVA_OPTS! -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
50+
set "JAVA_OPTS=!JAVA_OPTS! -Dlog4j2.isThreadContextMapInheritable=true"
51+
set "JAVA_OPTS=!JAVA_OPTS! -DAsyncLogger.ThreadNameStrategy=UNCACHED"
5152

5253
REM Server Debug Config
5354
REM Usage instructions:
5455
REM If you need to debug your code in cluster mode, please enable this configuration option and listen to the specified
5556
REM port in your IDE. After that, you can happily debug your code.
56-
REM set "JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5001,suspend=n"
57+
REM set "JAVA_OPTS=!JAVA_OPTS! -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5001,suspend=n"
5758

5859
if exist "%CONF_DIR%\log4j2.properties" (
59-
set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.logging.type=log4j2 -Dlog4j2.configurationFile=%CONF_DIR%\log4j2.properties"
60-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.path=%APP_DIR%\logs"
61-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-engine-server"
60+
set "JAVA_OPTS=!JAVA_OPTS! -Dhazelcast.logging.type=log4j2
61+
set "JAVA_OPTS=!JAVA_OPTS! -Dlog4j2.configurationFile=%CONF_DIR%\log4j2.properties"
62+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.path=%APP_DIR%\logs"
63+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-engine-server"
6264
)
6365

6466
if "%NODE_ROLE%" == "master" (
6567
set "OUT=%MASTER_OUT%"
66-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-engine-master"
68+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-engine-master"
6769
for /f "usebackq delims=" %%I in ("%APP_DIR%\config\jvm_master_options") do (
6870
set "line=%%I"
6971
if not "!line:~0,1!"=="#" if "!line!" NEQ "" (
@@ -75,7 +77,7 @@ if "%NODE_ROLE%" == "master" (
7577

7678
) else if "%NODE_ROLE%" == "worker" (
7779
set "OUT=%WORKER_OUT%"
78-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-engine-worker"
80+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-engine-worker"
7981
for /f "usebackq delims=" %%I in ("%APP_DIR%\config\jvm_worker_options") do (
8082
set "line=%%I"
8183
if not "!line:~0,1!"=="#" if "!line!" NEQ "" (
@@ -85,7 +87,7 @@ if "%NODE_ROLE%" == "master" (
8587
REM SeaTunnel Engine Config
8688
set "HAZELCAST_CONFIG=%CONF_DIR%\hazelcast-worker.yaml"
8789
) else if "%NODE_ROLE%" == "master_and_worker" (
88-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-engine-server"
90+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-engine-server"
8991
for /f "usebackq delims=" %%I in ("%APP_DIR%\config\jvm_options") do (
9092
set "line=%%I"
9193
if not "!line:~0,1!"=="#" if "!line!" NEQ "" (
@@ -103,23 +105,23 @@ REM Parse JvmOption from command line, it should be parsed after jvm_options
103105
for %%I in (%*) do (
104106
set "arg=%%I"
105107
if "!arg:~0,10!"=="JvmOption=" (
106-
set "JAVA_OPTS=%JAVA_OPTS% !arg:~10!"
108+
set "JAVA_OPTS=!JAVA_OPTS! !arg:~10!"
107109
)
108110
)
109111

110112
IF NOT EXIST "%HAZELCAST_CONFIG%" (
111113
echo Error: File %HAZELCAST_CONFIG% does not exist.
112114
exit /b 1
113115
)
114-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.config=%SEATUNNEL_CONFIG%"
115-
set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.config=%HAZELCAST_CONFIG%"
116+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.config=%SEATUNNEL_CONFIG%"
117+
set "JAVA_OPTS=!JAVA_OPTS! -Dhazelcast.config=%HAZELCAST_CONFIG%"
116118
set "CLASS_PATH=%APP_DIR%\lib\*;%APP_JAR%"
117119

118120
if "%HELP%"=="false" (
119121
if not exist "%APP_DIR%\logs\" mkdir "%APP_DIR%\logs"
120-
start "SeaTunnel Server" java %JAVA_OPTS% -cp "%CLASS_PATH%" %APP_MAIN% %args% > "%OUT%" 2>&1
122+
start "SeaTunnel Server" java !JAVA_OPTS! -cp "%CLASS_PATH%" %APP_MAIN% %args% > "%OUT%" 2>&1
121123
) else (
122-
java %JAVA_OPTS% -cp "%CLASS_PATH%" %APP_MAIN% %args%
124+
java !JAVA_OPTS! -cp "%CLASS_PATH%" %APP_MAIN% %args%
123125
)
124126

125127
endlocal

‎seatunnel-core/seatunnel-starter/src/main/bin/seatunnel.cmd

+12-11
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,22 @@ if not defined SEATUNNEL_CONFIG (
5555
)
5656

5757
if defined JvmOption (
58-
set "JAVA_OPTS=%JAVA_OPTS% %JvmOption%"
58+
set "JAVA_OPTS=!JAVA_OPTS! %JvmOption%"
5959
)
6060

61-
set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.client.config=%HAZELCAST_CLIENT_CONFIG%"
62-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.config=%SEATUNNEL_CONFIG%"
63-
set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.config=%HAZELCAST_CONFIG%"
61+
set "JAVA_OPTS=!JAVA_OPTS! -Dhazelcast.client.config=%HAZELCAST_CLIENT_CONFIG%"
62+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.config=%SEATUNNEL_CONFIG%"
63+
set "JAVA_OPTS=!JAVA_OPTS! -Dhazelcast.config=%HAZELCAST_CONFIG%"
6464

6565
REM if you want to debug, please
66-
REM set "JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=5000,suspend=n"
66+
REM set "JAVA_OPTS=!JAVA_OPTS! -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=5000,suspend=n"
6767

6868
REM Log4j2 Config
69-
set "JAVA_OPTS=%JAVA_OPTS% -Dlog4j2.isThreadContextMapInheritable=true"
69+
set "JAVA_OPTS=!JAVA_OPTS! -Dlog4j2.isThreadContextMapInheritable=true"
7070
if exist "%CONF_DIR%\log4j2_client.properties" (
71-
set "JAVA_OPTS=%JAVA_OPTS% -Dhazelcast.logging.type=log4j2 -Dlog4j2.configurationFile=%CONF_DIR%\log4j2_client.properties"
72-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.path=%APP_DIR%\logs"
71+
set "JAVA_OPTS=!JAVA_OPTS! -Dhazelcast.logging.type=log4j2"
72+
set "JAVA_OPTS=!JAVA_OPTS! -Dlog4j2.configurationFile=%CONF_DIR%\log4j2_client.properties"
73+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.path=%APP_DIR%\logs"
7374
for %%i in (%args%) do (
7475
set "arg=%%i"
7576
if "!arg!"=="-m" set "is_local_mode=true"
@@ -81,9 +82,9 @@ if exist "%CONF_DIR%\log4j2_client.properties" (
8182
for /f "tokens=1-3 delims=:" %%A in ('echo %time%') do (
8283
set "ntime=%%A%%B%%C"
8384
)
84-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-starter-client-!date:~0,4!!date:~5,2!!date:~8,2!-!time:~0,2!!time:~3,2!!time:~6,2!!ntime!"
85+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-starter-client-!date:~0,4!!date:~5,2!!date:~8,2!-!time:~0,2!!time:~3,2!!time:~6,2!!ntime!"
8586
) else (
86-
set "JAVA_OPTS=%JAVA_OPTS% -Dseatunnel.logs.file_name=seatunnel-starter-client"
87+
set "JAVA_OPTS=!JAVA_OPTS! -Dseatunnel.logs.file_name=seatunnel-starter-client"
8788
)
8889
)
8990

@@ -107,4 +108,4 @@ for %%i in (%*) do (
107108
)
108109
:break_loop
109110

110-
java %JAVA_OPTS% -cp %CLASS_PATH% %APP_MAIN% %args%
111+
java !JAVA_OPTS! -cp %CLASS_PATH% %APP_MAIN% %args%

0 commit comments

Comments
 (0)