From 1e2c06694e787201209b1d8953cf498a72c335d8 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 23 Feb 2019 11:04:08 -0800
Subject: Refactor configuration

---
 src/org/traccar/Context.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/Context.java')

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;
         }
-- 
cgit v1.2.3