aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-12-28 22:30:27 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-12-28 22:30:27 -0800
commit980d87ad01e5d962406e1f2d75c8584c5a00cf81 (patch)
tree6a842a2be72128f3e7d5b4212ee3bed13584bed3
parentf4c6ce093487a55220da7f29e3bb0644995cfc62 (diff)
downloadtrackermap-server-980d87ad01e5d962406e1f2d75c8584c5a00cf81.tar.gz
trackermap-server-980d87ad01e5d962406e1f2d75c8584c5a00cf81.tar.bz2
trackermap-server-980d87ad01e5d962406e1f2d75c8584c5a00cf81.zip
Use defined keys
-rw-r--r--src/main/java/org/traccar/Context.java4
-rw-r--r--src/main/java/org/traccar/api/HealthCheckService.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/Context.java b/src/main/java/org/traccar/Context.java
index d23314c06..3614497af 100644
--- a/src/main/java/org/traccar/Context.java
+++ b/src/main/java/org/traccar/Context.java
@@ -363,12 +363,12 @@ public final class Context {
String address;
try {
- address = config.getString("web.address", InetAddress.getLocalHost().getHostAddress());
+ address = config.getString(Keys.WEB_ADDRESS, InetAddress.getLocalHost().getHostAddress());
} catch (UnknownHostException e) {
address = "localhost";
}
- String webUrl = URIUtil.newURI("http", address, config.getInteger("web.port", 8082), "", "");
+ String webUrl = URIUtil.newURI("http", address, config.getInteger(Keys.WEB_PORT), "", "");
webUrl = Context.getConfig().getString("web.url", webUrl);
velocityProperties.setProperty("web.url", webUrl);
diff --git a/src/main/java/org/traccar/api/HealthCheckService.java b/src/main/java/org/traccar/api/HealthCheckService.java
index c9ce5a6c9..0182cc358 100644
--- a/src/main/java/org/traccar/api/HealthCheckService.java
+++ b/src/main/java/org/traccar/api/HealthCheckService.java
@@ -61,8 +61,8 @@ public class HealthCheckService {
}
private String getUrl() {
- String address = Context.getConfig().getString("web.address", "localhost");
- int port = Context.getConfig().getInteger("web.port", 8082);
+ String address = Context.getConfig().getString(Keys.WEB_ADDRESS, "localhost");
+ int port = Context.getConfig().getInteger(Keys.WEB_PORT);
return "http://" + address + ":" + port + "/api/server";
}