aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/Context.java
diff options
context:
space:
mode:
authorVitaly Litvak <vitavaque@gmail.com>2015-09-05 13:15:06 +0300
committerVitaly Litvak <vitavaque@gmail.com>2015-09-05 13:15:06 +0300
commitc7d05ca6969e7fd00f7000b47efe3865ff0d2cc2 (patch)
tree5fb40e364f57a2cebedb5efaf8399557f923e201 /src/org/traccar/Context.java
parent5f4e33e16040412edf3dbe34866a467429a9b37c (diff)
downloadtrackermap-server-c7d05ca6969e7fd00f7000b47efe3865ff0d2cc2.tar.gz
trackermap-server-c7d05ca6969e7fd00f7000b47efe3865ff0d2cc2.tar.bz2
trackermap-server-c7d05ca6969e7fd00f7000b47efe3865ff0d2cc2.zip
For #1395 - initialize API for old interface, added possibility to expose only API without any web application
Diffstat (limited to 'src/org/traccar/Context.java')
-rw-r--r--src/org/traccar/Context.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index f818368d0..86174d30f 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -125,12 +125,10 @@ public class Context {
}
if (config.getBoolean("web.enable")) {
- if (!config.getBoolean("web.old")) {
+ if (config.getString("web.type", "NEW").equals("NEW") || config.getString("web.type", "NEW").equals("API")) {
permissionsManager = new PermissionsManager(dataManager);
- webServer = new WebServer(config);
- } else {
- webServer = new WebServer(config, dataManager.getDataSource());
}
+ webServer = new WebServer(config, dataManager.getDataSource());
}
serverManager = new ServerManager();