From cf002c93be6655b85dfc3fd9c395b7bfbe3999eb Mon Sep 17 00:00:00 2001 From: icefox Date: Wed, 26 Jan 2022 23:20:43 +0800 Subject: [PATCH] fix start.bat(ISSUE#2814) fix start.bat [shenyu-bootstrap-dist missing agent parameter in start.bat script (Issue #2814)] --- .../src/main/resources/bin/start.bat | 104 ++++++++++-------- 1 file changed, 58 insertions(+), 46 deletions(-) diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.bat b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.bat index 6f37da311f24..cf82f13e51cf 100644 --- a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.bat +++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/start.bat @@ -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