diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-06-16 14:55:35 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-06-16 14:55:35 +1200 |
| commit | 6ceb897e22d426875d5fb4c3b434d000eb627afa (patch) | |
| tree | 979ed7cbc7c4d5c24ae9c87fb10f3be59bd1ff54 | |
| parent | 1c029a3bc2437230409c8daf39f03ec52014d579 (diff) | |
| download | traccar-server-6ceb897e22d426875d5fb4c3b434d000eb627afa.tar.gz traccar-server-6ceb897e22d426875d5fb4c3b434d000eb627afa.tar.bz2 traccar-server-6ceb897e22d426875d5fb4c3b434d000eb627afa.zip | |
Implement statistics collection
| -rw-r--r-- | setup/default.xml | 2 | ||||
| -rw-r--r-- | src/org/traccar/database/StatisticsManager.java | 26 | ||||
| -rw-r--r-- | src/org/traccar/model/Statistics.java | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/setup/default.xml b/setup/default.xml index 6c5035022..47954c9aa 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -22,6 +22,8 @@ <entry key='media.path'>./media</entry> + <entry key='server.statistics'>https://www.traccar.org/analytics/</entry> + <!-- DATABASE CONFIG --> <entry key='database.ignoreUnknown'>true</entry> diff --git a/src/org/traccar/database/StatisticsManager.java b/src/org/traccar/database/StatisticsManager.java index 8abadddc5..09cfee856 100644 --- a/src/org/traccar/database/StatisticsManager.java +++ b/src/org/traccar/database/StatisticsManager.java @@ -15,6 +15,9 @@ */ package org.traccar.database; +import com.ning.http.client.Request; +import com.ning.http.client.RequestBuilder; +import org.joda.time.format.ISODateTimeFormat; import org.traccar.Context; import org.traccar.helper.Log; import org.traccar.model.Statistics; @@ -27,7 +30,7 @@ import java.util.Set; public class StatisticsManager { - private static final int SPLIT_MODE = Calendar.DAY_OF_MONTH; + private static final int SPLIT_MODE = Calendar.MINUTE; private int lastUpdate = Calendar.getInstance().get(SPLIT_MODE); @@ -63,6 +66,27 @@ public class StatisticsManager { Log.warning(e); } + String url = Context.getConfig().getString("server.statistics"); + if (url != null) { + String time = ISODateTimeFormat.dateTime().print(statistics.getCaptureTime().getTime()); + Request request = new RequestBuilder("POST") + .setUrl(url) + .addHeader("Content-Type", "application/x-www-form-urlencoded") + .addFormParam("version", Log.getAppVersion()) + .addFormParam("captureTime", time) + .addFormParam("activeUsers", String.valueOf(statistics.getActiveUsers())) + .addFormParam("activeDevices", String.valueOf(statistics.getActiveDevices())) + .addFormParam("requests", String.valueOf(statistics.getRequests())) + .addFormParam("messagesReceived", String.valueOf(statistics.getMessagesReceived())) + .addFormParam("messagesStored", String.valueOf(statistics.getMessagesStored())) + .addFormParam("mailSent", String.valueOf(statistics.getMailSent())) + .addFormParam("smsSent", String.valueOf(statistics.getSmsSent())) + .addFormParam("geocoderRequests", String.valueOf(statistics.getGeocoderRequests())) + .addFormParam("geolocationRequests", String.valueOf(statistics.getGeolocationRequests())) + .build(); + Context.getAsyncHttpClient().prepareRequest(request).execute(); + } + users.clear(); devices.clear(); requests = 0; diff --git a/src/org/traccar/model/Statistics.java b/src/org/traccar/model/Statistics.java index 93a9c0d39..c7ae5af7a 100644 --- a/src/org/traccar/model/Statistics.java +++ b/src/org/traccar/model/Statistics.java @@ -116,6 +116,7 @@ public class Statistics extends Extensible { public void setGeocoderRequests(int geocoderRequests) { this.geocoderRequests = geocoderRequests; } + private int geolocationRequests; public int getGeolocationRequests() { |