From c282ba09b7e4321a2c7ad51f1d3fe0294080e2e4 Mon Sep 17 00:00:00 2001 From: Daniel Fesenmeyer Date: Tue, 17 Apr 2018 10:47:37 +0200 Subject: [PATCH] add some debug-logging for sending messages to concierge and retrieving messages at concierge Signed-off-by: Daniel Fesenmeyer --- .../gateway/endpoints/HttpRequestActor.java | 2 +- services/models/concierge/pom.xml | 4 ++++ .../models/concierge/ConciergeForwarder.java | 15 +++++++++++++-- .../utils/akka/controlflow/GraphActor.java | 4 ++++ .../utils/akka/controlflow/WithSender.java | 4 +--- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/HttpRequestActor.java b/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/HttpRequestActor.java index ac62e336bf..475c23b58d 100755 --- a/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/HttpRequestActor.java +++ b/services/gateway/endpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/HttpRequestActor.java @@ -334,7 +334,7 @@ public static Props props(final ActorRef proxyActor, final HttpRequest request, private static final long serialVersionUID = 1L; @Override - public HttpRequestActor create() throws Exception { + public HttpRequestActor create() { return new HttpRequestActor(proxyActor, request, httpResponseFuture); } }); diff --git a/services/models/concierge/pom.xml b/services/models/concierge/pom.xml index 1ee7d53f02..88d22f19e3 100644 --- a/services/models/concierge/pom.xml +++ b/services/models/concierge/pom.xml @@ -41,6 +41,10 @@ com.typesafe.akka akka-cluster-tools_${scala.version} + + org.slf4j + slf4j-api + diff --git a/services/models/concierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeForwarder.java b/services/models/concierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeForwarder.java index ac244bcf88..7f54b944ed 100644 --- a/services/models/concierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeForwarder.java +++ b/services/models/concierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeForwarder.java @@ -19,6 +19,8 @@ import org.eclipse.ditto.signals.base.Signal; import org.eclipse.ditto.signals.commands.messages.MessageCommand; import org.eclipse.ditto.signals.commands.things.ThingCommand; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import akka.actor.ActorRef; @@ -30,6 +32,8 @@ public final class ConciergeForwarder { private final ActorRef pubSubMediator; private final ActorRef enforcerShardRegion; + private static final Logger LOGGER = LoggerFactory.getLogger(ConciergeForwarder.class); + /** * Create an object to forward messages to concierge service. * @@ -43,9 +47,16 @@ public ConciergeForwarder(final ActorRef pubSubMediator, final ActorRef enforcer public void forward(final Signal signal, final ActorRef sender) { if (signal.getId().isEmpty()) { - pubSubMediator.tell(wrapForPubSub(signal), sender); + LOGGER.debug("Signal does not contain ID, forwarding to concierge-dispatcherActor: <{}>.", signal); + final Send msg = wrapForPubSub(signal); + LOGGER.debug("Sending message to concierge-dispatcherActor: <{}>.", msg); + pubSubMediator.tell(msg, sender); } else { - enforcerShardRegion.tell(wrapForEnforcer(signal), sender); + LOGGER.debug("Signal has ID <{}>, forwarding to concierge-shard-region: <{}>.", + signal.getId(), signal); + final ShardedMessageEnvelope msg = wrapForEnforcer(signal); + LOGGER.debug("Sending message to concierge-shard-region: <{}>.", msg); + enforcerShardRegion.tell(msg, sender); } } diff --git a/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/GraphActor.java b/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/GraphActor.java index 4e32cb954c..275dc4abe1 100644 --- a/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/GraphActor.java +++ b/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/GraphActor.java @@ -19,6 +19,7 @@ import akka.NotUsed; import akka.actor.AbstractActor; import akka.actor.Props; +import akka.event.DiagnosticLoggingAdapter; import akka.event.LoggingAdapter; import akka.japi.pf.ReceiveBuilder; import akka.stream.ActorMaterializer; @@ -35,6 +36,8 @@ */ public final class GraphActor extends AbstractActor { + private final DiagnosticLoggingAdapter log = LogUtil.obtain(this); + private final ActorMaterializer materializer; private final Sink messageHandler; @@ -103,6 +106,7 @@ public static GraphStage> unhandled() { public Receive createReceive() { return ReceiveBuilder.create() .matchAny(message -> { + log.debug("Received message: <{}>.", message); final WithSender wrapped = WithSender.of(message, getSender()); Source.single(wrapped).runWith(messageHandler, materializer); }) diff --git a/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/WithSender.java b/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/WithSender.java index f9b682a8c4..8b3abd5358 100644 --- a/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/WithSender.java +++ b/services/utils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/WithSender.java @@ -84,9 +84,7 @@ public int hashCode() { @Override public String toString() { - return getClass().getSimpleName() + - "[" + super.toString() + - ", message=" + message + + return getClass().getSimpleName() + " [message=" + message + ", sender=" + sender + "]"; }