aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorleandro <leandro@leandro-Satellite-A505>2012-08-03 13:11:52 -0400
committerleandro <leandro@leandro-Satellite-A505>2012-08-03 13:11:52 -0400
commit1dcac709aecfeaf19d616316bd2f23b96ef86390 (patch)
tree1d61c541c94c392200e962e3366590b756121c6f /src
parentb11ff82a003b828dbaecc564c54d447440249701 (diff)
downloadtraccar-server-1dcac709aecfeaf19d616316bd2f23b96ef86390.tar.gz
traccar-server-1dcac709aecfeaf19d616316bd2f23b96ef86390.tar.bz2
traccar-server-1dcac709aecfeaf19d616316bd2f23b96ef86390.zip
Atualização de parametros e dependencia do postgre
Diffstat (limited to 'src')
-rw-r--r--src/Main.java26
-rw-r--r--src/org/traccar/Server.java11
2 files changed, 25 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
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index e6eabdb71..f01b5af2a 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -251,6 +251,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -284,6 +285,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -316,6 +318,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -348,6 +351,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -380,6 +384,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -412,6 +417,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -444,6 +450,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -475,6 +482,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -503,6 +511,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -531,6 +540,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}
@@ -560,6 +570,7 @@ public class Server {
});
serverList.add(server);
+ Log.info("Activeting protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
}
}