aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-03-31 08:13:18 -0700
committerAnton Tananaev <anton@traccar.org>2024-03-31 08:13:18 -0700
commit301a643d62ccce053a1eaf10e5516a3d5bcc815f (patch)
treea904618d76ab7e6712ebf1289bee52f0340cd577 /src/main
parent0b403da4f4fe83517110a09acb1d280396379dfb (diff)
downloadtrackermap-server-301a643d62ccce053a1eaf10e5516a3d5bcc815f.tar.gz
trackermap-server-301a643d62ccce053a1eaf10e5516a3d5bcc815f.tar.bz2
trackermap-server-301a643d62ccce053a1eaf10e5516a3d5bcc815f.zip
Extract position logger
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/ProcessingHandler.java8
-rw-r--r--src/main/java/org/traccar/handler/network/MainEventHandler.java69
-rw-r--r--src/main/java/org/traccar/helper/PositionLogger.java94
3 files changed, 102 insertions, 69 deletions
diff --git a/src/main/java/org/traccar/ProcessingHandler.java b/src/main/java/org/traccar/ProcessingHandler.java
index 09ec79f9d..688389d98 100644
--- a/src/main/java/org/traccar/ProcessingHandler.java
+++ b/src/main/java/org/traccar/ProcessingHandler.java
@@ -51,6 +51,7 @@ import org.traccar.handler.events.MediaEventHandler;
import org.traccar.handler.events.MotionEventHandler;
import org.traccar.handler.events.OverspeedEventHandler;
import org.traccar.handler.network.AcknowledgementHandler;
+import org.traccar.helper.PositionLogger;
import org.traccar.model.Position;
import java.util.List;
@@ -64,13 +65,16 @@ import java.util.stream.Stream;
public class ProcessingHandler extends ChannelInboundHandlerAdapter {
private final NotificationManager notificationManager;
+ private final PositionLogger positionLogger;
private final List<BasePositionHandler> positionHandlers;
private final List<BaseEventHandler> eventHandlers;
private final PostProcessHandler postProcessHandler;
@Inject
- public ProcessingHandler(Injector injector, NotificationManager notificationManager) {
+ public ProcessingHandler(
+ Injector injector, NotificationManager notificationManager, PositionLogger positionLogger) {
this.notificationManager = notificationManager;
+ this.positionLogger = positionLogger;
positionHandlers = Stream.of(
TimeHandler.class,
@@ -145,7 +149,7 @@ public class ProcessingHandler extends ChannelInboundHandlerAdapter {
private void finishedProcessing(ChannelHandlerContext ctx, Position position) {
postProcessHandler.handlePosition(position, p -> {
- ctx.fireChannelRead(p);
+ positionLogger.log(ctx, p);
ctx.writeAndFlush(new AcknowledgementHandler.EventHandled(p));
});
}
diff --git a/src/main/java/org/traccar/handler/network/MainEventHandler.java b/src/main/java/org/traccar/handler/network/MainEventHandler.java
index d6407f1e5..f60004126 100644
--- a/src/main/java/org/traccar/handler/network/MainEventHandler.java
+++ b/src/main/java/org/traccar/handler/network/MainEventHandler.java
@@ -30,16 +30,11 @@ import org.traccar.BasePipelineFactory;
import org.traccar.BaseProtocolDecoder;
import org.traccar.config.Config;
import org.traccar.config.Keys;
-import org.traccar.helper.DateUtil;
import org.traccar.helper.NetworkUtil;
-import org.traccar.model.Device;
-import org.traccar.model.Position;
import org.traccar.session.ConnectionManager;
-import org.traccar.session.cache.CacheManager;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.Set;
@Singleton
@@ -48,76 +43,16 @@ public class MainEventHandler extends ChannelInboundHandlerAdapter {
private static final Logger LOGGER = LoggerFactory.getLogger(MainEventHandler.class);
- private final Set<String> connectionlessProtocols = new HashSet<>();
- private final Set<String> logAttributes = new LinkedHashSet<>();
-
- private final CacheManager cacheManager;
private final ConnectionManager connectionManager;
+ private final Set<String> connectionlessProtocols = new HashSet<>();
@Inject
- public MainEventHandler(
- Config config, CacheManager cacheManager, ConnectionManager connectionManager) {
- this.cacheManager = cacheManager;
+ public MainEventHandler(Config config, ConnectionManager connectionManager) {
this.connectionManager = connectionManager;
String connectionlessProtocolList = config.getString(Keys.STATUS_IGNORE_OFFLINE);
if (connectionlessProtocolList != null) {
connectionlessProtocols.addAll(Arrays.asList(connectionlessProtocolList.split("[, ]")));
}
- logAttributes.addAll(Arrays.asList(config.getString(Keys.LOGGER_ATTRIBUTES).split("[, ]")));
- }
-
- @Override
- public void channelRead(ChannelHandlerContext ctx, Object msg) {
- if (msg instanceof Position) {
-
- Position position = (Position) msg;
- Device device = cacheManager.getObject(Device.class, position.getDeviceId());
-
- StringBuilder builder = new StringBuilder();
- builder.append("[").append(NetworkUtil.session(ctx.channel())).append("] ");
- builder.append("id: ").append(device.getUniqueId());
- for (String attribute : logAttributes) {
- switch (attribute) {
- case "time":
- builder.append(", time: ").append(DateUtil.formatDate(position.getFixTime(), false));
- break;
- case "position":
- builder.append(", lat: ").append(String.format("%.5f", position.getLatitude()));
- builder.append(", lon: ").append(String.format("%.5f", position.getLongitude()));
- break;
- case "speed":
- if (position.getSpeed() > 0) {
- builder.append(", speed: ").append(String.format("%.1f", position.getSpeed()));
- }
- break;
- case "course":
- builder.append(", course: ").append(String.format("%.1f", position.getCourse()));
- break;
- case "accuracy":
- if (position.getAccuracy() > 0) {
- builder.append(", accuracy: ").append(String.format("%.1f", position.getAccuracy()));
- }
- break;
- case "outdated":
- if (position.getOutdated()) {
- builder.append(", outdated");
- }
- break;
- case "invalid":
- if (!position.getValid()) {
- builder.append(", invalid");
- }
- break;
- default:
- Object value = position.getAttributes().get(attribute);
- if (value != null) {
- builder.append(", ").append(attribute).append(": ").append(value);
- }
- break;
- }
- }
- LOGGER.info(builder.toString());
- }
}
@Override
diff --git a/src/main/java/org/traccar/helper/PositionLogger.java b/src/main/java/org/traccar/helper/PositionLogger.java
new file mode 100644
index 000000000..9f149edf4
--- /dev/null
+++ b/src/main/java/org/traccar/helper/PositionLogger.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import io.netty.channel.ChannelHandlerContext;
+import jakarta.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+import org.traccar.model.Device;
+import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class PositionLogger {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PositionLogger.class);
+
+ private final CacheManager cacheManager;
+ private final Set<String> logAttributes = new LinkedHashSet<>();
+
+ @Inject
+ public PositionLogger(Config config, CacheManager cacheManager) {
+ this.cacheManager = cacheManager;
+ logAttributes.addAll(Arrays.asList(config.getString(Keys.LOGGER_ATTRIBUTES).split("[, ]")));
+ }
+
+ public void log(ChannelHandlerContext context, Position position) {
+ Device device = cacheManager.getObject(Device.class, position.getDeviceId());
+
+ StringBuilder builder = new StringBuilder();
+ builder.append("[").append(NetworkUtil.session(context.channel())).append("] ");
+ builder.append("id: ").append(device.getUniqueId());
+ for (String attribute : logAttributes) {
+ switch (attribute) {
+ case "time":
+ builder.append(", time: ").append(DateUtil.formatDate(position.getFixTime(), false));
+ break;
+ case "position":
+ builder.append(", lat: ").append(String.format("%.5f", position.getLatitude()));
+ builder.append(", lon: ").append(String.format("%.5f", position.getLongitude()));
+ break;
+ case "speed":
+ if (position.getSpeed() > 0) {
+ builder.append(", speed: ").append(String.format("%.1f", position.getSpeed()));
+ }
+ break;
+ case "course":
+ builder.append(", course: ").append(String.format("%.1f", position.getCourse()));
+ break;
+ case "accuracy":
+ if (position.getAccuracy() > 0) {
+ builder.append(", accuracy: ").append(String.format("%.1f", position.getAccuracy()));
+ }
+ break;
+ case "outdated":
+ if (position.getOutdated()) {
+ builder.append(", outdated");
+ }
+ break;
+ case "invalid":
+ if (!position.getValid()) {
+ builder.append(", invalid");
+ }
+ break;
+ default:
+ Object value = position.getAttributes().get(attribute);
+ if (value != null) {
+ builder.append(", ").append(attribute).append(": ").append(value);
+ }
+ break;
+ }
+ }
+ LOGGER.info(builder.toString());
+ }
+
+}