Repository: james-project Updated Branches: refs/heads/master c590901a9 -> ff7703f99
JAMES-2177 Improve and unify logging upon mailbox provisioning Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fb40bd97 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fb40bd97 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fb40bd97 Branch: refs/heads/master Commit: fb40bd97765eaa404ab6cf5eb60564833ced9b9c Parents: c590901 Author: benwa <btell...@linagora.com> Authored: Tue Oct 10 08:33:27 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Oct 11 10:04:46 2017 +0700 ---------------------------------------------------------------------- .../apache/james/imap/processor/AbstractAuthProcessor.java | 9 ++++----- .../james/jmap/DefaultMailboxesProvisioningFilter.java | 4 +++- .../lmtpserver/hook/MailboxDeliverToRecipientHandler.java | 5 ++++- .../org/apache/james/pop3server/core/PassCmdHandler.java | 8 +++++++- 4 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fb40bd97/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java index 7208b3c..16af520 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java @@ -36,6 +36,7 @@ import org.apache.james.mailbox.exception.MailboxExistsException; import org.apache.james.mailbox.exception.NotAdminException; import org.apache.james.mailbox.exception.UserDoesNotExistException; import org.apache.james.mailbox.model.MailboxConstants; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.MetricFactory; import org.slf4j.Logger; @@ -135,12 +136,10 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr } } else { try { - LOGGER.debug("INBOX does not exist. Creating it."); - mailboxManager.createMailbox(inboxPath, mailboxSession); + Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inboxPath, mailboxSession); + LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); } catch (MailboxExistsException e) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Mailbox created by concurrent call. Safe to ignore this exception."); - } + LOGGER.warn("Mailbox INBOX created by concurrent call. Safe to ignore this exception."); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fb40bd97/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java index f9ef530..7738e6a 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java @@ -35,6 +35,7 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxExistsException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.metrics.api.TimeMetric; @@ -102,7 +103,8 @@ public class DefaultMailboxesProvisioningFilter implements Filter { private void createMailbox(MailboxPath mailboxPath, MailboxSession session) { try { - mailboxManager.createMailbox(mailboxPath, session); + Optional<MailboxId> mailboxId = mailboxManager.createMailbox(mailboxPath, session); + LOGGER.info("Provisioning " + mailboxPath + ". " + mailboxId + " created."); } catch (MailboxExistsException e) { LOGGER.info("Mailbox {} have been created concurrently", mailboxPath); } catch (MailboxException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fb40bd97/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java index dd213e6..8a5dadb 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java @@ -21,6 +21,7 @@ package org.apache.james.lmtpserver.hook; import java.io.IOException; import java.util.Date; +import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; @@ -31,6 +32,7 @@ import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook; import org.apache.james.protocols.smtp.MailEnvelope; @@ -85,7 +87,8 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook // create inbox if not exist if (!mailboxManager.mailboxExists(inbox, mailboxSession)) { - mailboxManager.createMailbox(inbox, mailboxSession); + Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inbox, mailboxSession); + LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); } mailboxManager.getMailbox(MailboxPath.inbox(mailboxSession), mailboxSession).appendMessage(envelope.getMessageInputStream(), new Date(), mailboxSession, true, null); mailboxManager.endProcessingRequest(mailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/fb40bd97/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java index 139d6f3..cc7a279 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java @@ -19,6 +19,7 @@ package org.apache.james.pop3server.core; import java.io.IOException; +import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; @@ -28,6 +29,7 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.BadCredentialsException; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.pop3server.mailbox.MailboxAdapter; import org.apache.james.protocols.api.Request; @@ -37,12 +39,15 @@ import org.apache.james.protocols.pop3.POP3Response; import org.apache.james.protocols.pop3.POP3Session; import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler; import org.apache.james.protocols.pop3.mailbox.Mailbox; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link PassCmdHandler} which also handles POP3 Before SMTP * */ public class PassCmdHandler extends AbstractPassCmdHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(PassCmdHandler.class); private MailboxManager manager; @@ -71,7 +76,8 @@ public class PassCmdHandler extends AbstractPassCmdHandler { // check if the mailbox exists, if not create it if (!manager.mailboxExists(inbox, mSession)) { - manager.createMailbox(inbox, mSession); + Optional<MailboxId> mailboxId = manager.createMailbox(inbox, mSession); + LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); } MessageManager mailbox = manager.getMailbox(MailboxPath.inbox(mSession), mSession); return new MailboxAdapter(manager, mailbox, mSession); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
