aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/ServerManager.java
diff options
context:
space:
mode:
authorChristoph Krey <c@ckrey.de>2018-04-16 10:45:11 +0200
committerGitHub <noreply@github.com>2018-04-16 10:45:11 +0200
commit3a602dd133b533cc69d5986d64a00fb3ed670f75 (patch)
tree97ff753db310a49ae7e53240b1db07fb8475679e /src/org/traccar/ServerManager.java
parent232de5f0daef98f31b28d177d991fdbfa191f195 (diff)
parent6d4b8df25c7e942b9ad594db9444fe15bcb16be9 (diff)
downloadtrackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.gz
trackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.bz2
trackermap-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.zip
Merge pull request #4 from traccar/master
upgrade to current master
Diffstat (limited to 'src/org/traccar/ServerManager.java')
-rw-r--r--src/org/traccar/ServerManager.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 9b1e2650d..45503b717 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -15,7 +15,11 @@
*/
package org.traccar;
+import org.jboss.netty.channel.ChannelException;
+import org.traccar.helper.Log;
+
import java.io.File;
+import java.net.BindException;
import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
@@ -78,7 +82,13 @@ public class ServerManager {
public void start() {
for (TrackerServer server: serverList) {
- server.start();
+ try {
+ server.start();
+ } catch (ChannelException e) {
+ if (e.getCause() instanceof BindException) {
+ Log.warning("One of the protocols is disabled due to port conflict");
+ }
+ }
}
}
@@ -86,8 +96,6 @@ public class ServerManager {
for (TrackerServer server: serverList) {
server.stop();
}
-
- // Release resources
GlobalChannelFactory.release();
GlobalTimer.release();
}