aboutsummaryrefslogtreecommitdiff
path: root/src/Main.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main.java')
-rw-r--r--src/Main.java26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/Main.java b/src/Main.java
index 783ebe0f6..69c029c61 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -4,21 +4,23 @@ import org.traccar.helper.Log;
public class Main {
public static void main(String[] args) throws Exception {
-
- final Server service = new Server();
- String[] argss = new String[1];
- argss[0] = "setup\\windows\\windows.cfg";
- service.init(argss);
-
- Log.info("starting server...");
-
+
+ final Server service = new Server();
+
+ if(args.length > 0){
+ Log.info("Using parameterized config: " + args[0]);
+ service.init(args);
+ }
+ else{
+ String[] argsDefault = new String[]{"setup\\windows\\windows.cfg"};
+ Log.info("Using default config: " + argsDefault[0]);
+ service.init(argsDefault);
+ }
+ Log.info("starting server...");
+
service.start();
-
-
-
-
// Shutdown server properly
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override