add some debug-logging for sending messages to concierge and retrievi…

…ng messages at concierge Signed-off-by: Daniel Fesenmeyer <daniel.fesenmeyer@bosch-si.com>
eclipse-ditto · Apr 17, 2018 · c282ba0 · c282ba0
1 parent 498ac4d
commit c282ba0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/...ndpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/HttpRequestActor.java b/...ndpoints/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
@@ -41,6 +41,10 @@
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-cluster-tools_${scala.version}</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...ncierge/src/main/java/org/eclipse/ditto/services/models/concierge/ConciergeForwarder.java b/...ncierge/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/...tils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/GraphActor.java b/...tils/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<WithSender, NotUsed> messageHandler;
 
@@ -103,6 +106,7 @@ public static GraphStage<SinkShape<WithSender>> 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/...tils/akka/src/main/java/org/eclipse/ditto/services/utils/akka/controlflow/WithSender.java b/...tils/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 +
                 "]";
     }