aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-29 12:39:04 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-29 12:39:04 +1200
commit51a0046d026d0e4273413e2e8c84ef9e26f0a4cf (patch)
tree260134e338c1c7f2cee0c716d07a64c0b0ea79a0 /src/org/traccar
parent9ab536ca8c4e1ad850cb5fa08bbe99f14676b535 (diff)
parent7644abe2e8aeb27de803b35bea772e2fe0a94c72 (diff)
downloadtraccar-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.tar.gz
traccar-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.tar.bz2
traccar-server-51a0046d026d0e4273413e2e8c84ef9e26f0a4cf.zip
Merge branch master from github
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/helper/Log.java14
1 files changed, 10 insertions, 4 deletions
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");
}
}