Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 02:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dependency updates for Q2 2025

Browse Source
This commit is contained in:
Katherine
2025-04-03 12:05:51 -04:00
committed by GitHub
parent 041643783d
commit b57bdcaaea
9 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
websocket-resources/src/main/java/org/whispersystems/websocket/logging/layout/WebsocketEventLayout.java
View File

@@ -5,6 +5,7 @@
package org.whispersystems.websocket.logging.layout;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.pattern.DynamicConverter;
import ch.qos.logback.core.pattern.PatternLayoutBase;
import org.whispersystems.websocket.logging.WebsocketEvent;
import org.whispersystems.websocket.logging.layout.converters.ContentLengthConverter;
@@ -18,9 +19,25 @@ import org.whispersystems.websocket.logging.layout.converters.StatusCodeConverte
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
public class WebsocketEventLayout extends PatternLayoutBase<WebsocketEvent> {
// Provides a mapping of conversion words to converter classes;
// required for extending PatternLayoutBase.
// See https://logback.qos.ch/manual/layouts.html#ClassicPatternLayout for more details.
private static final Map<String, Supplier<DynamicConverter>> DEFAULT_CONVERTER_SUPPLIERS = Map.of(
"h", RemoteHostConverter::new,
"l", NAConverter::new,
"u", NAConverter::new,
"t", DateConverter::new,
"r", RequestUrlConverter::new,
"s", StatusCodeConverter::new,
"b", ContentLengthConverter::new,
"i", RequestHeaderConverter::new
);
// Provided for backwards compatibility
private static final Map<String, String> DEFAULT_CONVERTERS = new HashMap<>() {{
put("h", RemoteHostConverter.class.getName());
put("l", NAConverter.class.getName());
@@ -47,6 +64,11 @@ public class WebsocketEventLayout extends PatternLayoutBase<WebsocketEvent> {
this.postCompileProcessor = new EnsureLineSeparation();
}
@Override
protected Map<String, Supplier<DynamicConverter>> getDefaultConverterSupplierMap() {
return DEFAULT_CONVERTER_SUPPLIERS;
}
@Override
public Map<String, String> getDefaultConverterMap() {
return DEFAULT_CONVERTERS;