From c7f91f61b757d716a86246d803c5654e2bff5be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 26 Jan 2023 14:40:57 +0100 Subject: [PATCH] Fix log message --- .../print/http/ConfigFileResolvingHttpRequestFactory.java | 2 +- .../main/java/org/mapfish/print/map/tiled/CoverageTask.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java index 5b9e16c455..f27f51cc3a 100644 --- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java +++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java @@ -136,7 +136,7 @@ protected synchronized ClientHttpResponse executeInternal(final HttpHeaders head final InputStream is = new ByteArrayInputStream(bytes); final ConfigFileResolverHttpResponse response = new ConfigFileResolverHttpResponse(is, headers); - LOGGER.debug("Resolved request: {} using mapfish print config file loaders.", + LOGGER.debug("Resolved request: {} using MapFish print config file loaders.", uriString); return response; } catch (NoSuchElementException e) { diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java index a7154b3d0a..7a2b4466e5 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java @@ -4,6 +4,7 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import org.apache.commons.io.IOUtils; import org.geotools.coverage.CoverageFactoryFinder; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.coverage.grid.GridCoverageFactory; @@ -25,6 +26,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.concurrent.Callable; import java.util.concurrent.RecursiveTask; @@ -235,7 +237,8 @@ protected Tile compute() { "Error making tile request: %s\nStatus: %s\n" + "Status message: %s\nServer:%s\nBody:\n%s", this.tileRequest.getURI(), statusCode, response.getStatusText(), - response.getHeaders().getFirst(HttpHeaders.SERVER), response.getBody())); + response.getHeaders().getFirst(HttpHeaders.SERVER), + IOUtils.toString(response.getBody(), StandardCharsets.UTF_8))); this.registry.counter(baseMetricName + ".error").inc(); if (this.failOnError) { throw new RuntimeException(errorMessage);