diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-09-14 14:33:49 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-09-14 14:33:49 +1200 |
| commit | b10824bb5769c4abb93e3451673b88efdfb9d467 (patch) | |
| tree | c4d04ed2f19d5758a75b702467dbc051c5d0511c /src/org/traccar/api | |
| parent | e331573c0df7467fd36ae3eba3c259ed9b1d9253 (diff) | |
| download | trackermap-server-b10824bb5769c4abb93e3451673b88efdfb9d467.tar.gz trackermap-server-b10824bb5769c4abb93e3451673b88efdfb9d467.tar.bz2 trackermap-server-b10824bb5769c4abb93e3451673b88efdfb9d467.zip | |
Log using slf4j and java logging
Diffstat (limited to 'src/org/traccar/api')
| -rw-r--r-- | src/org/traccar/api/AsyncSocket.java | 7 | ||||
| -rw-r--r-- | src/org/traccar/api/SecurityRequestFilter.java | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/org/traccar/api/AsyncSocket.java b/src/org/traccar/api/AsyncSocket.java index 70523d253..783aeb740 100644 --- a/src/org/traccar/api/AsyncSocket.java +++ b/src/org/traccar/api/AsyncSocket.java @@ -18,9 +18,10 @@ package org.traccar.api; import com.fasterxml.jackson.core.JsonProcessingException; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.traccar.Context; import org.traccar.database.ConnectionManager; -import org.traccar.helper.Log; import org.traccar.model.Device; import org.traccar.model.Event; import org.traccar.model.Position; @@ -32,6 +33,8 @@ import java.util.Map; public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.UpdateListener { + private static final Logger LOGGER = LoggerFactory.getLogger(AsyncSocket.class); + private static final String KEY_DEVICES = "devices"; private static final String KEY_POSITIONS = "positions"; private static final String KEY_EVENTS = "events"; @@ -86,7 +89,7 @@ public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.U try { getRemote().sendString(Context.getObjectMapper().writeValueAsString(data), null); } catch (JsonProcessingException e) { - Log.warning(e); + LOGGER.warn(null, e); } } } diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java index aace9f705..a76b34ad1 100644 --- a/src/org/traccar/api/SecurityRequestFilter.java +++ b/src/org/traccar/api/SecurityRequestFilter.java @@ -15,10 +15,11 @@ */ package org.traccar.api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.traccar.Context; import org.traccar.api.resource.SessionResource; import org.traccar.helper.DataConverter; -import org.traccar.helper.Log; import org.traccar.model.User; import javax.annotation.security.PermitAll; @@ -35,6 +36,8 @@ import java.sql.SQLException; public class SecurityRequestFilter implements ContainerRequestFilter { + private static final Logger LOGGER = LoggerFactory.getLogger(SecurityRequestFilter.class); + public static final String AUTHORIZATION_HEADER = "Authorization"; public static final String WWW_AUTHENTICATE = "WWW-Authenticate"; public static final String BASIC_REALM = "Basic realm=\"api\""; @@ -93,7 +96,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter { } } catch (SecurityException e) { - Log.warning(e); + LOGGER.warn(null, e); } if (securityContext != null) { |