aboutsummaryrefslogtreecommitdiffstats
path: root/rest-services/cbs-client/src
diff options
context:
space:
mode:
Diffstat (limited to 'rest-services/cbs-client/src')
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClient.java14
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImpl.java5
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java2
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/adapters/CloudHttpClient.java53
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java4
-rw-r--r--rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplIT.java58
-rw-r--r--rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplTest.java9
-rw-r--r--rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookupTest.java2
-rw-r--r--rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProviderTest.java6
-rw-r--r--rest-services/cbs-client/src/test/resources/logback-test.xml25
10 files changed, 117 insertions, 61 deletions
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClient.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClient.java
index 73789268..b9a6e40d 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClient.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClient.java
@@ -22,6 +22,9 @@ package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.time.Duration;
+import java.util.UUID;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.ImmutableRequestDiagnosticContext;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.jetbrains.annotations.NotNull;
@@ -41,23 +44,24 @@ public interface CbsClient {
* Returns a {@link Mono} that publishes new configuration after CBS client retrieves one.
*
* @return reactive stream of configuration
+ * @param diagnosticContext diagnostic context as defined in Logging Guideline
* @since 1.1.2
*/
- @NotNull Mono<JsonObject> get();
-
+ @NotNull Mono<JsonObject> get(RequestDiagnosticContext diagnosticContext);
/**
* Poll for configuration.
*
- * Will call {@link #get()} after {@code initialDelay} every {@code period}. Resulting entries may or may not be
+ * Will call {@link #get(RequestDiagnosticContext)} after {@code initialDelay} every {@code period}. Resulting entries may or may not be
* changed, ie. items in the stream might be the same until change is made in CBS.
*
* @param initialDelay delay after first request attempt
* @param period frequency of update checks
* @return stream of configuration states
*/
- default Flux<JsonElement> get(Duration initialDelay, Duration period) {
+ default Flux<JsonObject> get(RequestDiagnosticContext diagnosticContext, Duration initialDelay, Duration period) {
return Flux.interval(initialDelay, period)
- .flatMap(i -> get());
+ .map(i -> ImmutableRequestDiagnosticContext.copyOf(diagnosticContext).withInvocationId(UUID.randomUUID()))
+ .flatMap(this::get);
}
}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImpl.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImpl.java
index 0d32320a..d11be24b 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImpl.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImpl.java
@@ -25,6 +25,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import org.jetbrains.annotations.NotNull;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.adapters.CloudHttpClient;
import reactor.core.publisher.Mono;
@@ -55,7 +56,7 @@ public class CbsClientImpl implements CbsClient {
}
@Override
- public @NotNull Mono<JsonObject> get() {
- return Mono.defer(() -> httpClient.callHttpGet(fetchUrl, JsonObject.class));
+ public @NotNull Mono<JsonObject> get(RequestDiagnosticContext diagnosticContext) {
+ return Mono.defer(() -> httpClient.get(fetchUrl, diagnosticContext, JsonObject.class));
}
}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java
index ca7058f6..f5ec462d 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java
@@ -53,7 +53,7 @@ public class CbsLookup {
}
private Mono<JsonArray> fetchHttpData(String consulUrl) {
- return httpClient.callHttpGet(consulUrl, JsonArray.class);
+ return httpClient.get(consulUrl, JsonArray.class);
}
private Mono<JsonObject> firstService(JsonArray services) {
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/adapters/CloudHttpClient.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/adapters/CloudHttpClient.java
index 438ff667..13347e10 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/adapters/CloudHttpClient.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/adapters/CloudHttpClient.java
@@ -21,16 +21,12 @@
package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.adapters;
import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
import io.netty.handler.codec.http.HttpStatusClass;
import io.vavr.collection.Stream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import reactor.core.publisher.Mono;
@@ -51,9 +47,7 @@ public class CloudHttpClient {
private final HttpClient httpClient;
public CloudHttpClient() {
- this(HttpClient.create()
- .doOnRequest(CloudHttpClient::logRequest)
- .doOnResponse(CloudHttpClient::logResponse));
+ this(HttpClient.create());
}
@@ -61,9 +55,20 @@ public class CloudHttpClient {
this.httpClient = httpClient;
}
- public <T> Mono<T> callHttpGet(String url, Class<T> bodyClass) {
- return httpClient
- .get()
+ public <T> Mono<T> get(String url, RequestDiagnosticContext context, Class<T> bodyClass) {
+ final HttpClient clientWithHeaders = httpClient
+ .doOnRequest((req, conn) -> logRequest(context, req))
+ .doOnResponse((rsp, conn) -> logResponse(context, rsp))
+ .headers(hdrs -> context.remoteCallHttpHeaders().forEach((BiConsumer<String, String>) hdrs::set));
+ return callHttpGet(clientWithHeaders, url, bodyClass);
+ }
+
+ public <T> Mono<T> get(String url, Class<T> bodyClass) {
+ return callHttpGet(httpClient, url, bodyClass);
+ }
+
+ private <T> Mono<T> callHttpGet(HttpClient client, String url, Class<T> bodyClass) {
+ return client.get()
.uri(url)
.responseSingle((resp, content) -> HttpStatusClass.SUCCESS.contains(resp.status().code())
? content.asString()
@@ -81,18 +86,22 @@ public class CloudHttpClient {
return gson.fromJson(body, bodyClass);
}
- private static void logRequest(HttpClientRequest httpClientRequest, Connection connection) {
- LOGGER.debug("Request: {} {}", httpClientRequest.method(), httpClientRequest.uri());
- if (LOGGER.isTraceEnabled()) {
- final String headers = Stream.ofAll(httpClientRequest.requestHeaders())
- .map(entry -> entry.getKey() + "=" + entry.getValue())
- .collect(Collectors.joining("\n"));
- LOGGER.trace(headers);
- }
+ private void logRequest(RequestDiagnosticContext context, HttpClientRequest httpClientRequest) {
+ context.withSlf4jMdc(LOGGER.isDebugEnabled(), () -> {
+ LOGGER.debug("Request: {} {}", httpClientRequest.method(), httpClientRequest.uri());
+ if (LOGGER.isTraceEnabled()) {
+ final String headers = Stream.ofAll(httpClientRequest.requestHeaders())
+ .map(entry -> entry.getKey() + "=" + entry.getValue())
+ .collect(Collectors.joining("\n"));
+ LOGGER.trace(headers);
+ }
+ });
}
- private static void logResponse(HttpClientResponse httpClientResponse, Connection connection) {
- LOGGER.debug("Response status: {}", httpClientResponse.status());
+ private void logResponse(RequestDiagnosticContext context, HttpClientResponse httpClientResponse) {
+ context.withSlf4jMdc(LOGGER.isDebugEnabled(), () -> {
+ LOGGER.debug("Response status: {}", httpClientResponse.status());
+ });
}
-
}
+
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
index 5606a2d1..02e9b9cc 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
@@ -73,7 +73,7 @@ public final class ReactiveCloudConfigurationProvider implements CloudConfigurat
private Mono<String> callConsulForConfigBindingServiceEndpoint(EnvProperties envProperties) {
LOGGER.info("Retrieving Config Binding Service endpoint from Consul");
- return cloudHttpClient.callHttpGet(getConsulUrl(envProperties), JsonArray.class)
+ return cloudHttpClient.get(getConsulUrl(envProperties), JsonArray.class)
.flatMap(jsonArray -> this.createConfigBindingServiceUrl(jsonArray, envProperties.appName()));
}
@@ -84,7 +84,7 @@ public final class ReactiveCloudConfigurationProvider implements CloudConfigurat
private Mono<JsonObject> callConfigBindingServiceForConfiguration(String configBindingServiceUri) {
LOGGER.info("Retrieving configuration");
- return cloudHttpClient.callHttpGet(configBindingServiceUri, JsonObject.class);
+ return cloudHttpClient.get(configBindingServiceUri, JsonObject.class);
}
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplIT.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplIT.java
index 761cc5c1..309bb62f 100644
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplIT.java
+++ b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplIT.java
@@ -24,14 +24,17 @@ import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.Dummy
import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.DummyHttpServer.sendString;
import com.google.gson.JsonObject;
+import io.vavr.collection.Stream;
import java.time.Duration;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClientFactory;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.EnvProperties;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.ImmutableEnvProperties;
+import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -41,21 +44,30 @@ import reactor.test.StepVerifier;
*/
class CbsClientImplIT {
- private static final String CONSUL_RESP = "[\n"
+ private static final String CONSUL_RESPONSE = "[\n"
+ " {\n"
+ " \"ServiceAddress\": \"HOST\",\n"
+ " \"ServiceName\": \"the_cbs\",\n"
+ " \"ServicePort\": PORT\n"
+ " }\n"
+ "]\n";
- private static final String RES_CONFIG = "/sample_config.json";
+ private static final String SAMPLE_CONFIG = "/sample_config.json";
+ private static final String SAMPLE_CONFIG_KEY = "keystore.path";
+ private static final String EXPECTED_CONFIG_VALUE = "/var/run/security/keystore.p12";
+ private static EnvProperties sampleEnvironment;
private static DummyHttpServer server;
@BeforeAll
static void setUp() {
server = DummyHttpServer.start(routes ->
routes.get("/v1/catalog/service/the_cbs", (req, resp) -> sendString(resp, lazyConsulResponse()))
- .get("/service_component/dcae-component", (req, resp) -> sendResource(resp, RES_CONFIG)));
+ .get("/service_component/dcae-component", (req, resp) -> sendResource(resp, SAMPLE_CONFIG)));
+ sampleEnvironment = ImmutableEnvProperties.builder()
+ .appName("dcae-component")
+ .cbsName("the_cbs")
+ .consulHost(server.host())
+ .consulPort(server.port())
+ .build();
}
@AfterAll
@@ -64,28 +76,44 @@ class CbsClientImplIT {
}
@Test
- void testCbsClient() {
+ void testCbsClientWithSingleCall() {
// given
- final EnvProperties env = ImmutableEnvProperties.builder()
- .appName("dcae-component")
- .cbsName("the_cbs")
- .consulHost(server.host())
- .consulPort(server.port())
- .build();
- final Mono<CbsClient> sut = CbsClientFactory.createCbsClient(env);
+ final Mono<CbsClient> sut = CbsClientFactory.createCbsClient(sampleEnvironment);
+ final RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
+
+ // when
+ final Mono<JsonObject> result = sut.flatMap(cbsClient -> cbsClient.get(diagnosticContext));
+
+ // then
+ StepVerifier.create(result.map(this::sampleConfigValue))
+ .expectNext(EXPECTED_CONFIG_VALUE)
+ .expectComplete()
+ .verify(Duration.ofSeconds(5));
+ }
+
+ @Test
+ void testCbsClientWithPeriodicCall() {
+ // given
+ final Mono<CbsClient> sut = CbsClientFactory.createCbsClient(sampleEnvironment);
+ final RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
// when
- final Mono<JsonObject> result = sut.flatMap(CbsClient::get);
+ final Flux<JsonObject> result = sut.flatMapMany(cbsClient -> cbsClient.get(diagnosticContext, Duration.ZERO, Duration.ofMillis(10)));
// then
- StepVerifier.create(result.map(obj -> obj.get("keystore.path").getAsString()))
- .expectNext("/var/run/security/keystore.p12")
+ final int itemsToTake = 5;
+ StepVerifier.create(result.take(itemsToTake).map(this::sampleConfigValue))
+ .expectNextSequence(Stream.of(EXPECTED_CONFIG_VALUE).cycle(itemsToTake))
.expectComplete()
.verify(Duration.ofSeconds(5));
}
+ private String sampleConfigValue(JsonObject obj) {
+ return obj.get(SAMPLE_CONFIG_KEY).getAsString();
+ }
+
private static Mono<String> lazyConsulResponse() {
- return Mono.just(CONSUL_RESP)
+ return Mono.just(CONSUL_RESPONSE)
.map(CbsClientImplIT::processConsulResponseTemplate);
}
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplTest.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplTest.java
index 65284c5f..606d00b3 100644
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplTest.java
+++ b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientImplTest.java
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify;
import com.google.gson.JsonObject;
import java.net.InetSocketAddress;
import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.adapters.CloudHttpClient;
import reactor.core.publisher.Mono;
@@ -47,13 +48,15 @@ class CbsClientImplTest {
String serviceName = "dcaegen2-ves-collector";
final CbsClientImpl cut = CbsClientImpl.create(httpClient, cbsAddress, serviceName);
final JsonObject httpResponse = new JsonObject();
- given(httpClient.callHttpGet(anyString(), any(Class.class))).willReturn(Mono.just(httpResponse));
+ given(httpClient.get(anyString(), any(RequestDiagnosticContext.class), any(Class.class))).willReturn(Mono.just(httpResponse));
+ RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
// when
- final JsonObject result = cut.get().block();
+ final JsonObject result = cut.get(diagnosticContext).block();
// then
- verify(httpClient).callHttpGet("http://cbshost:6969/service_component/dcaegen2-ves-collector", JsonObject.class);
+ final String expectedUrl = "http://cbshost:6969/service_component/dcaegen2-ves-collector";
+ verify(httpClient).get(expectedUrl, diagnosticContext, JsonObject.class);
assertThat(result).isSameAs(httpResponse);
}
} \ No newline at end of file
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookupTest.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookupTest.java
index e7513852..b46b958b 100644
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookupTest.java
+++ b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookupTest.java
@@ -87,7 +87,7 @@ class CbsLookupTest {
+ env.consulPort()
+ "/v1/catalog/service/"
+ env.cbsName();
- given(httpClient.callHttpGet(url, JsonArray.class))
+ given(httpClient.get(url, JsonArray.class))
.willReturn(Mono.just(jsonArray));
}
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProviderTest.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProviderTest.java
index 4e8782b6..3f720c37 100644
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProviderTest.java
+++ b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProviderTest.java
@@ -67,9 +67,9 @@ class ReactiveCloudConfigurationProviderTest {
// given
CloudHttpClient webClient = mock(CloudHttpClient.class);
when(
- webClient.callHttpGet("http://consul:8500/v1/catalog/service/config-binding-service", JsonArray.class))
+ webClient.get("http://consul:8500/v1/catalog/service/config-binding-service", JsonArray.class))
.thenReturn(Mono.just(configBindingServiceJson));
- when(webClient.callHttpGet("http://config-binding-service:10000/service_component/dcae-prh", JsonObject.class))
+ when(webClient.get("http://config-binding-service:10000/service_component/dcae-prh", JsonObject.class))
.thenReturn(Mono.just(configurationJsonMock));
ReactiveCloudConfigurationProvider provider = new ReactiveCloudConfigurationProvider(webClient);
@@ -84,7 +84,7 @@ class ReactiveCloudConfigurationProviderTest {
// given
CloudHttpClient webClient = mock(CloudHttpClient.class);
when(
- webClient.callHttpGet("http://consul:8500/v1/catalog/service/config-binding-service", JsonArray.class))
+ webClient.get("http://consul:8500/v1/catalog/service/config-binding-service", JsonArray.class))
.thenReturn(Mono.just(emptyConfigBindingServiceJson));
ReactiveCloudConfigurationProvider provider = new ReactiveCloudConfigurationProvider(webClient);
diff --git a/rest-services/cbs-client/src/test/resources/logback-test.xml b/rest-services/cbs-client/src/test/resources/logback-test.xml
index 8e468cfb..fa2fe1fb 100644
--- a/rest-services/cbs-client/src/test/resources/logback-test.xml
+++ b/rest-services/cbs-client/src/test/resources/logback-test.xml
@@ -19,19 +19,30 @@
~ ============LICENSE_END=========================================================
-->
<configuration>
- <property name="p_tim" value="%date{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
- <property name="p_lvl" value="%highlight(%-5level)"/>
- <property name="p_log" value="%50.50logger"/>
- <property name="SIMPLE_LOG_PATTERN" value="
+ <property name="p_log" value="%logger"/>
+ <property name="p_lor" value="%50.50logger"/>
+ <property name="p_tim" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC}"/>
+ <property name="p_lvl" value="%level"/>
+ <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+ <property name="p_mdc" value="%replace(%replace(%mdc){'\t', '\\\\t'}){'\n', '\\\\n'}"/>
+ <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+ <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+ <property name="p_thr" value="%thread"/>
+
+ <property name="READABLE_LOG_PATTERN" value="
%nopexception
| ${p_tim}\t
-| ${p_log}\t
+| ${p_lor}\t
| ${p_lvl}\t
-| %msg%n"/>
+| %msg\t
+| ${p_mak}\t
+| %rootException\t
+| ${p_mdc}\t
+| ${p_thr}%n"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>${SIMPLE_LOG_PATTERN}</pattern>
+ <pattern>${READABLE_LOG_PATTERN}</pattern>
</encoder>
</appender>