Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #403 from renderorange/remove-invalid-java-invocation-arguments

Browse Source 
Remove invalid java invocation arguments
This commit is contained in:
Alexander Savchuk 2020-12-03 22:20:23 +13:00 committed by GitHub
commit 7680df5d79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/msm
View File

@ -3251,7 +3251,7 @@ register_settings() {
register_server_setting WORLDS_FLAG_INRAM "inram" register_server_setting WORLDS_FLAG_INRAM "inram"
register_server_setting RAM "1024" register_server_setting RAM "1024"
register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui" register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui"
register_server_setting STOP_DELAY "10" register_server_setting STOP_DELAY "10"
register_server_setting RESTART_DELAY "10" register_server_setting RESTART_DELAY "10"

2
msm.conf
View File

@ -162,7 +162,7 @@ DEFAULT_RAM="1024"
# #
# Hard coding values here (not using {MEMORY} and {JAR} tags) will prevent # Hard coding values here (not using {MEMORY} and {JAR} tags) will prevent
# servers from individually overriding those values. # servers from individually overriding those values.
DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui" DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui"
# The default time to delay between warning players the server is stopping and # The default time to delay between warning players the server is stopping and

2
test.sh
View File

@ -48,7 +48,7 @@ setUp() {
echo "DEBUG=\"true\"" >> "$MSM_CONF" echo "DEBUG=\"true\"" >> "$MSM_CONF"
echo "DEFAULT_USERNAME=\"${USERNAME}\"" >> "$MSM_CONF" echo "DEFAULT_USERNAME=\"${USERNAME}\"" >> "$MSM_CONF"
echo "DEFAULT_SCREEN_NAME=\"msmtest-${SERVER_NAME}\"" >> "$MSM_CONF" echo "DEFAULT_SCREEN_NAME=\"msmtest-${SERVER_NAME}\"" >> "$MSM_CONF"
echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui\"" >> "$MSM_CONF" echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -jar {JAR} nogui\"" >> "$MSM_CONF"
source $TEST_SCRIPT source $TEST_SCRIPT