diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-03 02:40:13 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-03 02:40:13 +1300 |
| commit | eba56dfeceee5c77eac64b7da8abc8a7e8b70415 (patch) | |
| tree | 5572c47a1f05b34faab0a7be5f4c2179d61c876a | |
| parent | 4363d81ec076f1743488db49b14686e04decae2a (diff) | |
| download | trackermap-server-eba56dfeceee5c77eac64b7da8abc8a7e8b70415.tar.gz trackermap-server-eba56dfeceee5c77eac64b7da8abc8a7e8b70415.tar.bz2 trackermap-server-eba56dfeceee5c77eac64b7da8abc8a7e8b70415.zip | |
Include version in server model
| -rw-r--r-- | src/org/traccar/helper/Log.java | 8 | ||||
| -rw-r--r-- | src/org/traccar/model/Server.java | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/org/traccar/helper/Log.java b/src/org/traccar/helper/Log.java index bdf83c4f3..d74246a64 100644 --- a/src/org/traccar/helper/Log.java +++ b/src/org/traccar/helper/Log.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2013 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,10 @@ public final class Log { private static Logger logger = null; + public static String getAppVersion() { + return Log.class.getPackage().getImplementationVersion(); + } + public static void setupLogger(Config config) throws IOException { Layout layout = new PatternLayout("%d{" + DATE_FORMAT + "} %5p: %m%n"); @@ -72,7 +76,7 @@ public final class Log { }); Log.logSystemInfo(); - Log.info("Version: " + Log.class.getPackage().getImplementationVersion()); + Log.info("Version: " + getAppVersion()); } public static Logger getLogger() { diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java index 060a7d1d6..5cf26f7f2 100644 --- a/src/org/traccar/model/Server.java +++ b/src/org/traccar/model/Server.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,17 @@ */ package org.traccar.model; +import org.traccar.helper.Log; + public class Server extends Extensible { + public String getVersion() { + return Log.getAppVersion(); + } + + public void setVersion(String version) { + } + private boolean registration; public boolean getRegistration() { |