Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(control) Reduce log spam in control svc

Browse Source
This commit is contained in:
Viktor Lofgren 2023-07-31 14:20:27 +02:00
parent c9d7635370
commit d95f01b701
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/common/service/src/main/java/nu/marginalia/service/server/Service.java
View File

@ -119,11 +119,7 @@ public class Service {
Spark.halt(403); Spark.halt(403);
} }
String url = request.pathInfo(); logRequest(request);
if (request.queryString() != null) {
url = url + "?" + request.queryString();
}
logger.info(httpMarker, "PUBLIC {}: {} {}", Context.fromRequest(request).getContextId(), request.requestMethod(), url);
} }
private Object isInitialized(Request request, Response response) { private Object isInitialized(Request request, Response response) {
@ -168,9 +164,8 @@ public class Service {
request_counter_bad.labels(serviceName).inc(); request_counter_bad.labels(serviceName).inc();
} }
if (null != request.headers("X-Public")) { logResponse(request, response);
logger.info(httpMarker, "RSP {}", response.status());
}
} }
private void paintThreadName(Request request, String prefix) { private void paintThreadName(Request request, String prefix) {
@ -178,7 +173,7 @@ public class Service {
Thread.currentThread().setName(prefix + ctx.getContextId()); Thread.currentThread().setName(prefix + ctx.getContextId());
} }
private void handleException(Exception ex, Request request, Response response) { protected void handleException(Exception ex, Request request, Response response) {
request_counter_err.labels(serviceName).inc(); request_counter_err.labels(serviceName).inc();
if (ex instanceof MessagingException) { if (ex instanceof MessagingException) {
logger.error("{} {}", ex.getClass().getSimpleName(), ex.getMessage()); logger.error("{} {}", ex.getClass().getSimpleName(), ex.getMessage());
@ -188,4 +183,21 @@ public class Service {
} }
} }
/** Log the request on the HTTP log */
protected void logRequest(Request request) {
String url = request.pathInfo();
if (request.queryString() != null) {
url = url + "?" + request.queryString();
}
logger.info(httpMarker, "PUBLIC {}: {} {}", Context.fromRequest(request).getContextId(), request.requestMethod(), url);
}
/** Log the response on the HTTP log */
protected void logResponse(Request request, Response response) {
if (null != request.headers("X-Public")) {
logger.info(httpMarker, "RSP {}", response.status());
}
}
} }

17
code/services-satellite/control-service/src/main/java/nu/marginalia/control/ControlService.java
View File

@ -120,6 +120,23 @@ public class ControlService extends Service {
monitors.subscribe(this::logMonitorStateChange); monitors.subscribe(this::logMonitorStateChange);
} }
@Override
public void logRequest(Request request) {
if ("GET".equals(request.requestMethod()))
return;
super.logRequest(request);
}
@Override
public void logResponse(Request request, Response response) {
if ("GET".equals(request.requestMethod()))
return;
super.logResponse(request, response);
}
private Object messageModel(Request request, Response response) { private Object messageModel(Request request, Response response) {
var message = messageQueueViewService.getMessage(Long.parseLong(request.params("id"))); var message = messageQueueViewService.getMessage(Long.parseLong(request.params("id")));
if (message != null) { if (message != null) {