github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-22 19:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added charset check and hint in startup logs (related to #7020)

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-28 08:34:01 +04:00
parent b610d0a31a
commit a0c16dc4e1
10 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/release/startClient.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar
start javaw -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -jar .\lib\mage-client-${project.version}.jar

2
Mage.Client/release/startClient.command
View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`"
java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &
java -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -jar ./lib/mage-client-${project.version}.jar &

2
Mage.Client/release/startClient.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh
java -Xms256m -Xmx512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &
java -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -jar ./lib/mage-client-${project.version}.jar &

2
Mage.Client/release/startClientWin7.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
start javaw -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar
start javaw -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -jar .\lib\mage-client-${project.version}.jar

5
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -1270,6 +1270,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
LOGGER.info("Starting MAGE client version " + VERSION);
LOGGER.info("Logging level: " + LOGGER.getEffectiveLevel());
LOGGER.info("Default charset: " + Charset.defaultCharset());
if (!Charset.defaultCharset().toString().equals("UTF-8")) {
LOGGER.warn("WARNING, found wrong default charset. You must:");
LOGGER.warn("* Open launcher -> settings -> java -> client java options");
LOGGER.warn("* Insert additional command at the the end: -Dfile.encoding=UTF-8");
}
startTime = System.currentTimeMillis();
Thread.setDefaultUncaughtExceptionHandler((t, e) -> LOGGER.fatal(null, e));

2
Mage.Server/release/startServer.bat
View file

@ -4,5 +4,5 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
java -Xms256m -Xmx512m -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
java -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
pause

2
Mage.Server/release/startServer.command
View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`"
java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
java -Xms256M -Xmx512M -Dfile.encoding=UTF-8 -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

2
Mage.Server/release/startServer.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh
java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
java -Xms256M -Xmx512M -Dfile.encoding=UTF-8 -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

2
Mage.Server/release/startServerWin7.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR
java -Xms256M -Xmx512M -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
java -Xms256M -Xmx512M -Dfile.encoding=UTF-8 -Djava.security.policy=./config/security.policy -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar

2
Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
* started before running them. In case you want to debug these tests, use
* -Ddebug.mage that would disable client-server request timeout.
* <p>
* Then it's also better to use -Xms256M -Xmx512M JVM options for these stests.
* Then it's also better to use -Xms256M -Xmx512M JVM options for these tests.
*
* @author JayDi85
*/