aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2023-12-10 14:04:52 -0800
committerAnton Tananaev <anton@traccar.org>2023-12-10 14:04:52 -0800
commit87b2f36a487edc54cf4d8a1e27ce338f67bf8d55 (patch)
tree1403f5e5f34eaa637628118d31eaf845dd581b2e /src
parentf26a894807be6c2ea06e28d3ce33d7aea34a1ade (diff)
downloadtrackermap-server-87b2f36a487edc54cf4d8a1e27ce338f67bf8d55.tar.gz
trackermap-server-87b2f36a487edc54cf4d8a1e27ce338f67bf8d55.tar.bz2
trackermap-server-87b2f36a487edc54cf4d8a1e27ce338f67bf8d55.zip
Include user id in web logs
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/web/WebRequestLog.java57
-rw-r--r--src/main/java/org/traccar/web/WebServer.java4
2 files changed, 58 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/web/WebRequestLog.java b/src/main/java/org/traccar/web/WebRequestLog.java
new file mode 100644
index 000000000..3f3286003
--- /dev/null
+++ b/src/main/java/org/traccar/web/WebRequestLog.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023 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.web;
+
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.DateCache;
+import org.eclipse.jetty.util.component.ContainerLifeCycle;
+import org.traccar.api.resource.SessionResource;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class WebRequestLog extends ContainerLifeCycle implements RequestLog {
+
+ private final Writer writer;
+
+ private final DateCache dateCache = new DateCache(
+ "dd/MMM/yyyy:HH:mm:ss ZZZ", Locale.getDefault(), TimeZone.getTimeZone("GMT"));
+
+ public WebRequestLog(Writer writer) {
+ this.writer = writer;
+ addBean(writer);
+ }
+
+ @Override
+ public void log(Request request, Response response) {
+ try {
+ Long userId = (Long) request.getSession().getAttribute(SessionResource.USER_ID_KEY);
+ writer.write(String.format("%s - %s [%s] \"%s %s %s\" %d %d",
+ request.getRemoteHost(),
+ userId != null ? String.valueOf(userId) : "-",
+ dateCache.format(request.getTimeStamp()),
+ request.getMethod(),
+ request.getOriginalURI(),
+ request.getProtocol(),
+ response.getCommittedMetaData().getStatus(),
+ response.getHttpChannel().getBytesWritten()));
+ } catch (Throwable ignored) {
+ }
+ }
+
+}
diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java
index 5f27f7662..4759942b1 100644
--- a/src/main/java/org/traccar/web/WebServer.java
+++ b/src/main/java/org/traccar/web/WebServer.java
@@ -21,7 +21,6 @@ import org.eclipse.jetty.http.HttpCookie;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.proxy.AsyncProxyServlet;
-import org.eclipse.jetty.server.CustomRequestLog;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLogWriter;
import org.eclipse.jetty.server.Server;
@@ -115,8 +114,7 @@ public class WebServer implements LifecycleObject {
RequestLogWriter logWriter = new RequestLogWriter(config.getString(Keys.WEB_REQUEST_LOG_PATH));
logWriter.setAppend(true);
logWriter.setRetainDays(config.getInteger(Keys.WEB_REQUEST_LOG_RETAIN_DAYS));
- CustomRequestLog requestLog = new CustomRequestLog(logWriter, CustomRequestLog.NCSA_FORMAT);
- server.setRequestLog(requestLog);
+ server.setRequestLog(new WebRequestLog(logWriter));
}
}