aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/Context.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-02-23 11:04:08 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2019-02-23 11:04:08 -0800
commit1e2c06694e787201209b1d8953cf498a72c335d8 (patch)
tree53bc5d36faba98f2a2a6257f8791e0dbb6d314a8 /src/org/traccar/Context.java
parentd338b1177bcc46bb1b1bad1d8a76d6008dfe2239 (diff)
downloadtrackermap-server-1e2c06694e787201209b1d8953cf498a72c335d8.tar.gz
trackermap-server-1e2c06694e787201209b1d8953cf498a72c335d8.tar.bz2
trackermap-server-1e2c06694e787201209b1d8953cf498a72c335d8.zip
Refactor configuration
Diffstat (limited to 'src/org/traccar/Context.java')
-rw-r--r--src/org/traccar/Context.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index d679842cd..d9fed22ec 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -27,6 +27,7 @@ import org.apache.velocity.app.VelocityEngine;
import org.eclipse.jetty.util.URIUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.traccar.config.Config;
import org.traccar.database.CalendarManager;
import org.traccar.database.CommandsManager;
import org.traccar.database.AttributesManager;
@@ -362,9 +363,9 @@ public final class Context {
public static void init(String configFile) throws Exception {
try {
- config = new Config();
- config.load(configFile);
+ config = new Config(configFile);
} catch (Exception e) {
+ config = new Config();
Log.setupDefaultLogger();
throw e;
}