Skip to content

Commit

Permalink
fix start.bat(ISSUE#2814)
Browse files Browse the repository at this point in the history
fix start.bat [shenyu-bootstrap-dist missing agent parameter in start.bat script (Issue #2814)]
  • Loading branch information
IceFoxs committed Jan 26, 2022
1 parent 658db3e commit cf002c9
Showing 1 changed file with 58 additions and 46 deletions.
104 changes: 58 additions & 46 deletions shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.bat
Original file line number Diff line number Diff line change
@@ -1,46 +1,58 @@
@rem
@rem Licensed to the Apache Software Foundation (ASF) under one or more
@rem contributor license agreements. See the NOTICE file distributed with
@rem this work for additional information regarding copyright ownership.
@rem The ASF licenses this file to You under the Apache License, Version 2.0
@rem (the "License"); you may not use this file except in compliance with
@rem the License. You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@echo off & setlocal enabledelayedexpansion

cd %~dp0

set LOG_HOME=%~dp0/../logs

set SERVER_NAME=ShenYu-Bootstrap

set CLASS_PATH=".;..\conf;..\lib\*;..\ext-lib\*"

set JAVA_OPTS=-server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC -XX:LargePageSizeInBytes=128m
for /f tokens^=2-5^ delims^=^" %%j in ('java -fullversion 2^>^&1') do set "version=%%j"
echo %version%| findstr "^1.8" >nul && (
set "JAVA_OPTS=%JAVA_OPTS% -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
)
echo %version%| findstr "^11" >nul && (
set "JAVA_OPTS=%JAVA_OPTS%
)
echo %version%| findstr "^17" >nul && (
set "JAVA_OPTS=%JAVA_OPTS%
)

set MAIN_CLASS=org.apache.shenyu.bootstrap.ShenyuBootstrapApplication

echo Starting the %SERVER_NAME% ...

java %JAVA_OPTS% -Dfile.encoding=UTF-8 -Dlog.home=%LOG_HOME% -classpath %CLASS_PATH% %MAIN_CLASS%

pause
@rem
@rem Licensed to the Apache Software Foundation (ASF) under one or more
@rem contributor license agreements. See the NOTICE file distributed with
@rem this work for additional information regarding copyright ownership.
@rem The ASF licenses this file to You under the Apache License, Version 2.0
@rem (the "License"); you may not use this file except in compliance with
@rem the License. You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@echo off & setlocal enabledelayedexpansion

cd %~dp0
set BASE_DIR=%~dp0
set BASE_DIR=%BASE_DIR:~0,-5%

set LOG_HOME=%BASE_DIR%/logs
set SERVER_NAME=ShenYu-Bootstrap

set CLASS_PATH=".;..\conf;..\lib\*;..\ext-lib\*"

set JAVA_OPTS=-server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC -XX:LargePageSizeInBytes=128m
for /f tokens^=2-5^ delims^=^" %%j in ('java -fullversion 2^>^&1') do set "version=%%j"
echo %version%| findstr "^1.8" >nul && (
set "JAVA_OPTS=%JAVA_OPTS% -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
)
echo %version%| findstr "^11" >nul && (
set "JAVA_OPTS=%JAVA_OPTS%"
)
echo %version%| findstr "^17" >nul && (
set "JAVA_OPTS=%JAVA_OPTS%"
)

set MAIN_CLASS=org.apache.shenyu.bootstrap.ShenyuBootstrapApplication

echo current jdk version:%version%

set AGENT=%1%

set "SHENYU_AGENT=-javaagent:%BASE_DIR%\agent\shenyu-agent.jar"

if "%AGENT%"=="agent" (
echo Starting the %SERVER_NAME% with shenyu-agent ...
java %JAVA_OPTS% %SHENYU_AGENT% -Dfile.encoding=UTF-8 -Dlog.home=%LOG_HOME% -classpath %CLASS_PATH% %MAIN_CLASS%
) ^
else (
echo Starting the %SERVER_NAME% ...
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -Dlog.home=%LOG_HOME% -classpath %CLASS_PATH% %MAIN_CLASS%
)

pause

0 comments on commit cf002c9

Please sign in to comment.