aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-28 12:12:33 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-28 12:12:33 +1200
commit7644abe2e8aeb27de803b35bea772e2fe0a94c72 (patch)
treeff5d80b28dc35d6ef38ae726a4a679ec358781df
parent09a99e1e3971612fe7effea976e0cd1e669f4320 (diff)
downloadtraccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.tar.gz
traccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.tar.bz2
traccar-server-7644abe2e8aeb27de803b35bea772e2fe0a94c72.zip
Set character encoding to UTF-8
-rwxr-xr-xsetup/package.sh1
-rw-r--r--setup/windows/traccar.iss1
-rw-r--r--src/org/traccar/helper/Log.java14
3 files changed, 12 insertions, 4 deletions
diff --git a/setup/package.sh b/setup/package.sh
index 45facba5a..5199e972c 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -120,6 +120,7 @@ package_unix () {
sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf
sed -i '/wrapper.app.parameter.1/i\wrapper.app.parameter.2=../conf/traccar.xml' out/conf/wrapper.conf
+ sed -i 's/wrapper.java.additional.1=/wrapper.java.additional.1=-Dfile.encoding=UTF-8/g' out/conf/wrapper.conf
sed -i 's/<YourMainClass>/org.traccar.Main/g' out/conf/wrapper.conf
sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf
sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 933b12b58..2c0dac5e6 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -65,6 +65,7 @@ begin
LoadStringFromFile(ExpandConstant(CurrentFileName), S);
Insert('wrapper.java.classpath.2=../tracker-server.jar' + #13#10, S, Pos('wrapper.java.classpath.1', S));
Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\traccar.xml"') + #13#10, S, Pos('wrapper.app.parameter.1', S));
+ StringChangeEx(S, 'wrapper.java.additional.1=', 'wrapper.java.additional.1=-Dfile.encoding=UTF-8', true);
StringChangeEx(S, '<YourMainClass>', 'org.traccar.Main', true);
StringChangeEx(S, '@app.name@', 'Traccar', true);
StringChangeEx(S, '@app.long.name@', 'Traccar', true);
diff --git a/src/org/traccar/helper/Log.java b/src/org/traccar/helper/Log.java
index e4b0168a9..d5d5a6cda 100644
--- a/src/org/traccar/helper/Log.java
+++ b/src/org/traccar/helper/Log.java
@@ -20,6 +20,8 @@ import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean;
+import java.nio.charset.Charset;
+
import org.apache.log4j.Appender;
import org.apache.log4j.DailyRollingFileAppender;
import org.apache.log4j.Layout;
@@ -79,22 +81,26 @@ public class Log {
public static void logSystemInfo() {
try {
OperatingSystemMXBean operatingSystemBean = ManagementFactory.getOperatingSystemMXBean();
- Log.info("Operating System" +
+ Log.info("Operating system" +
" name: " + operatingSystemBean.getName() +
" version: " + operatingSystemBean.getVersion() +
" architecture: " + operatingSystemBean.getArch());
RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
- Log.info("Java Runtime" +
+ Log.info("Java runtime" +
" name: " + runtimeBean.getVmName() +
" vendor: " + runtimeBean.getVmVendor() +
" version: " + runtimeBean.getVmVersion());
MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
- Log.info("Memory Limit" +
+ Log.info("Memory limit" +
" heap: " + memoryBean.getHeapMemoryUsage().getMax() / (1024 * 1024) + "mb" +
" non-heap: " + memoryBean.getNonHeapMemoryUsage().getMax() / (1024 * 1024) + "mb");
- } catch (Exception e) {
+
+ Log.info("Character encoding: " +
+ System.getProperty("file.encoding") + " charset: " + Charset.defaultCharset());
+
+ } catch (Exception error) {
Log.warning("Failed to get system info");
}
}