kokuwaio/micronaut-logging
1
0
Fork 0
Code Issues 1 Pull requests Releases 6 Activity

Bump to java 17 (micronaut dependency)

Browse source
This commit is contained in:
Stephan Schnabel 2023-05-15 08:58:14 +02:00
parent bdd423ee8d
commit 962e649fa7
Signed by: stephan.schnabel
GPG key ID: E07AF5BA239FE543
5 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java
View file

@ -70,21 +70,15 @@ public class RootAutoSelectAppenderAction extends Action {
private void setAppender(Logger rootLogger, String appenderName) {
addInfo("Use appender: " + appenderName);
Layout<ILoggingEvent> layout;
switch (appenderName) {
case APPENDER_JSON:
layout = json();
break;
case APPENDER_GCP:
layout = gcp();
break;
case APPENDER_CONSOLE:
layout = console();
break;
default:
Layout<ILoggingEvent> layout = switch (appenderName) {
case APPENDER_JSON -> json();
case APPENDER_GCP -> gcp();
case APPENDER_CONSOLE -> console();
default -> {
addError("Appender " + appenderName + " not found. Using console ...");
layout = console();
}
yield console();
}
};
layout.start();
var encoder = new LayoutWrappingEncoder<ILoggingEvent>();

6
src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java
View file

@ -40,7 +40,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
@Value("${" + PREFIX + ".prefix}") Optional<String> prefix,
@Value("${" + PREFIX + ".order}") Optional<Integer> order) {
super(order.orElse(DEFAULT_ORDER), prefix.orElse(null));
this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet());
this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toUnmodifiableSet());
log.info("Configured with header names {}", headers);
}
@ -48,9 +48,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
var mdc = new HashMap<String, String>();
for (var header : headers) {
request.getHeaders()
.getFirst(header)
.ifPresent(value -> mdc.put(header, String.valueOf(value)));
request.getHeaders().getFirst(header).ifPresent(value -> mdc.put(header, String.valueOf(value)));
}
return doFilter(request, chain, mdc);
}