JAMES-2199 Fix some incorrect logger calls Some calls did not pass enough format args. Other calls had malformed format string syntax.
These issues were found by SLF4J Helper for NetBeans IDE: http://plugins.netbeans.org/plugin/72557/ Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c2008297 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c2008297 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c2008297 Branch: refs/heads/master Commit: c2008297d23ca63456eae10a365bfb3fc0d08ff4 Parents: 741ff58 Author: Daniel Trebbien <[email protected]> Authored: Thu Oct 19 21:44:19 2017 -0500 Committer: Antoine Duprat <[email protected]> Committed: Mon Dec 18 20:31:49 2017 +0100 ---------------------------------------------------------------------- .../james/mailbox/cassandra/mail/CassandraMessageIdMapper.java | 2 +- .../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +- .../james/mailbox/store/event/MailboxAnnotationListener.java | 2 +- .../main/java/org/apache/james/imap/processor/IdleProcessor.java | 2 +- .../org/apache/james/user/cassandra/CassandraUsersRepository.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c2008297/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java index 2f343a3..5307674 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java @@ -256,7 +256,7 @@ public class CassandraMessageIdMapper implements MessageIdMapper { try { return updateFlags(mailboxId, messageId, newState, updateMode); } catch (MailboxException e) { - LOGGER.error("Error while updating flags on mailbox: ", mailboxId); + LOGGER.error("Error while updating flags on mailbox: {}", mailboxId); return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/c2008297/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index 697b523..770c360 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -330,7 +330,7 @@ public class CassandraMessageMapper implements MessageMapper { .map(Throwing .function((UpdatedFlags updatedFlags) -> indexTableHandler.updateIndexOnFlagsUpdate(mailboxId, updatedFlags)) .fallbackTo(failedindex -> { - LOGGER.error("Could not update flag indexes for mailboxId {} UID {}. This will lead to inconsistencies across Cassandra tables"); + LOGGER.error("Could not update flag indexes for mailboxId {} UID {}. This will lead to inconsistencies across Cassandra tables", mailboxId, failedindex.getUid()); return CompletableFuture.completedFuture(null); }))) .completableFuture() http://git-wip-us.apache.org/repos/asf/james-project/blob/c2008297/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java index 43656a5..ab82fe0 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java @@ -66,7 +66,7 @@ public class MailboxAnnotationListener implements MailboxListener { try { annotationMapper.deleteAnnotation(mailboxId, annotation.getKey()); } catch (Exception e) { - logger.error("Unable to delete annotation {0} cause {1}", annotation.getKey(), e.getMessage()); + logger.error("Unable to delete annotation {} cause {}", annotation.getKey(), e.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/c2008297/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java index 14aa418..70f8d1e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java @@ -117,7 +117,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme try { mailboxManager.removeListener(sm.getPath(), idleListener, mailboxSession); } catch (MailboxException e) { - LOGGER.error("Unable to remove idle listener for mailbox {0}", sm.getPath(), e); + LOGGER.error("Unable to remove idle listener for mailbox {}", sm.getPath(), e); } } session.popLineHandler(); http://git-wip-us.apache.org/repos/asf/james-project/blob/c2008297/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java index 3f808ce..d823f01 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java @@ -166,7 +166,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository { return Optional.ofNullable(getUserByName(name)) .map(x -> x.verifyPassword(password)) .orElseGet(() -> { - LOGGER.info("Could not retrieve user {}. Password is unverified."); + LOGGER.info("Could not retrieve user {}. Password is unverified.", name); return false; }); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
