diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-01-12 00:56:03 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-01-12 00:56:03 +1300 |
commit | 900cbdd8b23cf0e9266523b21f2251510fcc1468 (patch) | |
tree | ffe824e491bd01a2df1e144a820ec175834d07f8 /src/org/traccar/Server.java | |
parent | f10f359d0531417b11a2a0fa1862efd6eae742b9 (diff) | |
download | traccar-server-900cbdd8b23cf0e9266523b21f2251510fcc1468.tar.gz traccar-server-900cbdd8b23cf0e9266523b21f2251510fcc1468.tar.bz2 traccar-server-900cbdd8b23cf0e9266523b21f2251510fcc1468.zip |
Integrate new web interface
Diffstat (limited to 'src/org/traccar/Server.java')
-rw-r--r-- | src/org/traccar/Server.java | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index d4e4a94cb..e1d9efa3d 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -111,17 +111,11 @@ public class Server { initMeitrackServer(properties); initSkypatrolServer(properties); initGt02Server(properties); - initGt06Server(properties); + initGt06Server(properties); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { - Integer port = Integer.valueOf(properties.getProperty("http.port", "8082")); - String address = properties.getProperty("http.address"); - if (address != null) { - webServer = new WebServer(address, port, dataManager); - } else { - webServer = new WebServer(port, dataManager); - } + webServer = new WebServer(properties); } } @@ -144,11 +138,11 @@ public class Server { for (Object server: serverList) { ((TrackerServer) server).stop(); } - + // Release resources GlobalChannelFactory.release(); GlobalTimer.release(); - + if (webServer != null) { webServer.stop(); } @@ -638,7 +632,7 @@ public class Server { serverList.add(server); } } - + /** * Init EV603 server */ @@ -666,7 +660,7 @@ public class Server { serverList.add(server); } } - + /** * Init V680 server */ @@ -694,7 +688,7 @@ public class Server { serverList.add(server); } } - + /** * Init PT502 server */ |