MAILBOX-355 MailboxOperationLoggingListener should rely on MailboxId
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6fe88912 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6fe88912 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6fe88912 Branch: refs/heads/master Commit: 6fe88912201a2c0d9026f4c2a0dec26822572bb6 Parents: 577d661 Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Dec 4 10:02:22 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Wed Dec 5 16:34:25 2018 +0700 ---------------------------------------------------------------------- .../cassandra/MailboxOperationLoggingListener.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6fe88912/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java index f6bdfb8..8d8ae40 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox.cassandra; +import static org.apache.james.mailbox.cassandra.GhostMailbox.MAILBOX_ID; import static org.apache.james.mailbox.cassandra.GhostMailbox.MAILBOX_NAME; import static org.apache.james.mailbox.cassandra.GhostMailbox.TYPE; @@ -44,25 +45,22 @@ public class MailboxOperationLoggingListener implements MailboxListener { if (event instanceof MailboxRenamed) { MailboxRenamed mailboxRenamed = (MailboxRenamed) event; GhostMailbox.logger() + .addField(MAILBOX_ID, mailboxRenamed.getMailboxId()) .addField(MAILBOX_NAME, mailboxRenamed.getNewPath()) .addField(TYPE, ADDED) .log(logger -> logger.info("Mailbox renamed event")); - GhostMailbox.logger() - .addField(MAILBOX_NAME, mailboxRenamed.getMailboxPath()) - .addField(TYPE, REMOVED) - .log(logger -> logger.info("Mailbox renamed event")); } if (event instanceof MailboxDeletion) { MailboxDeletion mailboxDeletion = (MailboxDeletion) event; GhostMailbox.logger() - .addField(MAILBOX_NAME, mailboxDeletion.getMailboxPath()) + .addField(MAILBOX_ID, mailboxDeletion.getMailboxId()) .addField(TYPE, REMOVED) .log(logger -> logger.info("Mailbox deleted event")); } if (event instanceof MailboxAdded) { MailboxAdded mailboxAdded = (MailboxAdded) event; GhostMailbox.logger() - .addField(MAILBOX_NAME, mailboxAdded.getMailboxPath()) + .addField(MAILBOX_ID, mailboxAdded.getMailboxId()) .addField(TYPE, ADDED) .log(logger -> logger.info("Mailbox added event")); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org