fixed error log message which was no error but debug

* updated to OpenJ9 0.11.0 as base java runtime Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Dec 6, 2018 · 4361bd1 · 4361bd1
1 parent d057ac9
commit 4361bd1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...ints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/AbstractRoute.java b/...ints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/AbstractRoute.java
@@ -24,10 +24,12 @@
 import org.eclipse.ditto.json.JsonParseException;
 import org.eclipse.ditto.json.JsonParseOptions;
 import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.model.base.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
 import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
 import org.eclipse.ditto.protocoladapter.HeaderTranslator;
 import org.eclipse.ditto.services.gateway.endpoints.HttpRequestActor;
+import org.eclipse.ditto.services.utils.akka.LogUtil;
 import org.eclipse.ditto.services.utils.protocol.ProtocolAdapterProvider;
 import org.eclipse.ditto.services.utils.protocol.ProtocolConfigReader;
 import org.eclipse.ditto.signals.commands.base.Command;
@@ -96,7 +98,13 @@ protected AbstractRoute(final ActorRef proxyActor, final ActorSystem actorSystem
 
         materializer = ActorMaterializer.create(ActorMaterializerSettings.create(actorSystem)
                 .withSupervisionStrategy((Function<Throwable, Supervision.Directive>) exc -> {
-                            LOGGER.error("Exception during materialization of HTTP request: {}", exc.getMessage(), exc);
+                            if (exc instanceof DittoRuntimeException) {
+                                LogUtil.logWithCorrelationId(LOGGER, (DittoRuntimeException) exc, logger ->
+                                        logger.debug("DittoRuntimeException during materialization of HTTP request: [{}] {}",
+                                                exc.getClass().getSimpleName(), exc.getMessage()));
+                            } else {
+                                LOGGER.warn("Exception during materialization of HTTP request: {}", exc.getMessage(), exc);
+                            }
                             return Supervision.stop(); // in any case, stop!
                         }
                 ), actorSystem);

diff --git a/services/pom.xml b/services/pom.xml
@@ -47,7 +47,7 @@
         <docker.registry>docker.io</docker.registry>
         <docker.repository>${docker.registry}/eclipse</docker.repository>
         <docker.image.additional.tag/>
-        <docker.image.jdk>docker.io/adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u181-b13_openj9-0.9.0-slim</docker.image.jdk>
+        <docker.image.jdk>docker.io/adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u192-b12_openj9-0.11.0-slim</docker.image.jdk>
         <docker.image.port>8080</docker.image.port>
 
         <policies.docker.image.name>ditto-policies</policies.docker.image.name>

diff --git a/services/src/Dockerfile b/services/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u181-b13_openj9-0.9.0-slim
+FROM adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u192-b12_openj9-0.11.0-slim
 
 ARG MAVEN_REPO=https://repo.eclipse.org/content/repositories/ditto/org/eclipse/ditto/
 ARG SERVICE_STARTER