extend logging;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Sep 26, 2022 · b964079 · b964079
1 parent f872b24
commit b964079
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...lipse/ditto/internal/utils/persistence/operations/AbstractPersistenceOperationsActor.java b/...lipse/ditto/internal/utils/persistence/operations/AbstractPersistenceOperationsActor.java
@@ -72,7 +72,8 @@ public abstract class AbstractPersistenceOperationsActor extends AbstractActor {
      */
     private static final Duration SHUTDOWN_ASK_TIMEOUT = Duration.ofMinutes(2L);
 
-    private static final Throwable KILL_SWITCH_EXCEPTION = new IllegalStateException();
+    private static final Throwable KILL_SWITCH_EXCEPTION =
+            new IllegalStateException("Aborting persistence operations stream because of graceful shutdown.");
 
     private final ActorRef pubSubMediator;
     private final EntityType entityType;
@@ -395,7 +396,8 @@ private void opComplete(final OpComplete opComplete) {
     }
 
     private void serviceRequestsDone(final Control serviceRequestsDone) {
-        logger.info("Re-schedule/Publish {} commands via PubSub.", lastCommandsAndSender.size());
+        logger.info("Re-schedule/Publish <{}> commands for <{}> via PubSub.", lastCommandsAndSender.size(),
+                getActorName());
         killSwitch.abort(KILL_SWITCH_EXCEPTION);
         lastCommandsAndSender.forEach((command, sender) -> {
             if (command instanceof PurgeNamespace purgeNamespace) {

diff --git a/...va/org/eclipse/ditto/internal/utils/persistentactors/cleanup/PersistenceCleanupActor.java b/...va/org/eclipse/ditto/internal/utils/persistentactors/cleanup/PersistenceCleanupActor.java
@@ -77,7 +77,7 @@ public final class PersistenceCleanupActor extends AbstractFSM<PersistenceCleanu
     private static final Duration SHUTDOWN_ASK_TIMEOUT = Duration.ofMinutes(2L);
 
     private static final Throwable KILL_SWITCH_EXCEPTION =
-            new IllegalStateException("Aborting stream because of graceful shutdown.");
+            new IllegalStateException("Aborting persistence clean up stream because of graceful shutdown.");
 
     private final ThreadSafeDittoLoggingAdapter logger = DittoLoggerFactory.getThreadSafeDittoLoggingAdapter(this);
     private final Materializer materializer = Materializer.createMaterializer(getContext());