Merge pull request akka#130 from psliwa/patch-2

[akka#127] Fix warning log for message deletion failure
bjxiaoshuang · Oct 17, 2016 · b359952 · b359952
2 parents 33baa53 + cf3f243
commit b359952
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/scala/akka/persistence/cassandra/journal/CassandraJournal.scala b/src/main/scala/akka/persistence/cassandra/journal/CassandraJournal.scala
@@ -298,7 +298,9 @@ class CassandraJournal(cfg: Config) extends AsyncWriteJournal with CassandraReco
                   {
                     val delete = asyncDeleteMessages(pi.partitionNr, group map (MessageId(persistenceId, _)))
                     delete.onFailure {
-                      case e => log.warning(s"Unable to complete deletes for persistence id ${persistenceId}, toSequenceNr ${toSequenceNr}. The plugin will continue to function correctly but you will need to manually delete the old messages.", e)
+                      case e => log.warning(s"Unable to complete deletes for persistence id {}, toSequenceNr {}. " +
+                        "The plugin will continue to function correctly but you will need to manually delete the old messages. " +
+                        "Caused by: [{}: {}]", persistenceId, toSequenceNr, e.getClass.getName, e.getMessage)
                     }
                     delete
                   }
@@ -311,9 +313,9 @@ class CassandraJournal(cfg: Config) extends AsyncWriteJournal with CassandraReco
                 boundDeleteMessages.flatMap(execute(_, deleteRetryPolicy))
               }))
                 .onFailure {
-                  case e => log.warning(s"Unable to complete deletes for persistence id ${persistenceId}, " +
-                    s"toSequenceNr ${toSequenceNr}. The plugin will continue to " +
-                    "function correctly but you will need to manually delete the old messages.", e)
+                  case e => log.warning("Unable to complete deletes for persistence id {}, toSequenceNr {}. " +
+                    "The plugin will continue to function correctly but you will need to manually delete the old messages. " +
+                    "Caused by: [{}: {}]", persistenceId, toSequenceNr, e.getClass.getName, e.getMessage)
                 }
             }
           }