diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-09-26 22:27:15 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-09-26 22:27:15 +1300 |
| commit | ccd4a65a4954bcd7d2c38b806440bb766c51b0e2 (patch) | |
| tree | 4f0acc8410583dea3ca9c8cbb0b37a28bd2d547c /src/org/traccar/api | |
| parent | 53bcb5c788e6b24bf8f6f631445b61a87c5f715f (diff) | |
| download | trackermap-server-ccd4a65a4954bcd7d2c38b806440bb766c51b0e2.tar.gz trackermap-server-ccd4a65a4954bcd7d2c38b806440bb766c51b0e2.tar.bz2 trackermap-server-ccd4a65a4954bcd7d2c38b806440bb766c51b0e2.zip | |
Change statistics calculation logic
Diffstat (limited to 'src/org/traccar/api')
| -rw-r--r-- | src/org/traccar/api/SecurityRequestFilter.java | 3 | ||||
| -rw-r--r-- | src/org/traccar/api/resource/SessionResource.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java index ff4241b97..9e0f03de7 100644 --- a/src/org/traccar/api/SecurityRequestFilter.java +++ b/src/org/traccar/api/SecurityRequestFilter.java @@ -55,7 +55,6 @@ public class SecurityRequestFilter implements ContainerRequestFilter { @Override public void filter(ContainerRequestContext requestContext) { - Context.getStatisticsManager().registerRequest(); if (requestContext.getMethod().equals("OPTIONS")) { return; @@ -70,6 +69,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter { String[] auth = decodeBasicAuth(authHeader); User user = Context.getDataManager().login(auth[0], auth[1]); if (user != null) { + Context.getStatisticsManager().registerRequest(user.getId()); securityContext = new UserSecurityContext(new UserPrincipal(user.getId())); } } catch (SQLException e) { @@ -80,6 +80,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter { Long userId = (Long) request.getSession().getAttribute(SessionResource.USER_ID_KEY); if (userId != null) { + Context.getStatisticsManager().registerRequest(userId); securityContext = new UserSecurityContext(new UserPrincipal(userId)); } diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java index 4ab1960c9..deed70b37 100644 --- a/src/org/traccar/api/resource/SessionResource.java +++ b/src/org/traccar/api/resource/SessionResource.java @@ -73,7 +73,6 @@ public class SessionResource extends BaseResource { } if (userId != null) { - Context.getStatisticsManager().registerUser(userId); return Context.getPermissionsManager().getUser(userId); } else { throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build()); @@ -86,7 +85,6 @@ public class SessionResource extends BaseResource { @FormParam("email") String email, @FormParam("password") String password) throws SQLException { User user = Context.getPermissionsManager().login(email, password); if (user != null) { - Context.getStatisticsManager().registerUser(user.getId()); request.getSession().setAttribute(USER_ID_KEY, user.getId()); return user; } else { |