You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/12/18 19:35:17 UTC
[41/50] [abbrv] james-project git commit: JAMES-2199 Pass arrays to
logger calls
JAMES-2199 Pass arrays to logger calls
SLF4J "natively" supports logging arrays:
https://github.com/qos-ch/slf4j/blob/a81440ea36676f3b090f5a4ccba70d17c7b80f6e/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java#L265
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/87aa70d4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/87aa70d4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/87aa70d4
Branch: refs/heads/master
Commit: 87aa70d4d8ab22ee7b7756e8281cb5da2d37a759
Parents: ac56346
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Mon Oct 30 11:44:13 2017 -0400
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 18 20:31:54 2017 +0100
----------------------------------------------------------------------
.../events/ElasticSearchListeningMessageSearchIndex.java | 5 +++--
.../james/transport/mailets/redirect/MailModifier.java | 6 ++----
.../transport/mailets/remoteDelivery/MailDelivrer.java | 9 ++++-----
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/87aa70d4/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
index d8634f5..bcf1ba5 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
@@ -146,8 +146,9 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
.map(uid -> indexIdFor(mailbox, uid))
.collect(Collectors.toList()));
} catch (Exception e) {
- LOGGER.error("Error when deleting messages {} in mailbox {} from index",
- mailbox.getMailboxId().serialize(), expungedUids, e);
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.error("Error when deleting messages {} in mailbox {} from index", mailbox.getMailboxId().serialize(), expungedUids.toArray(), e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/87aa70d4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java
index 3b69b72..cfb1c63 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java
@@ -19,7 +19,6 @@
package org.apache.james.transport.mailets.redirect;
import java.net.UnknownHostException;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -34,7 +33,6 @@ import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
import org.apache.mailet.base.DateFormats;
import org.apache.mailet.base.RFC2822Headers;
-import org.apache.mailet.base.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -112,7 +110,7 @@ public class MailModifier {
mail.setRecipients(recipients);
if (mailet.getInitParameters().isDebug()) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("recipients set to: " + StringUtils.arrayToString(recipients.toArray()));
+ LOGGER.debug("recipients set to: {}", (Object) recipients.toArray());
}
}
}
@@ -123,7 +121,7 @@ public class MailModifier {
InternetAddress[] internetAddresses = MailAddressUtils.toInternetAddressArray(mailAddresses);
mail.getMessage().setRecipients(Message.RecipientType.TO, internetAddresses);
if (mailet.getInitParameters().isDebug()) {
- LOGGER.debug("apparentlyTo set to: {}", Arrays.asList(internetAddresses));
+ LOGGER.debug("apparentlyTo set to: {}", (Object) internetAddresses);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/87aa70d4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
index c2f0640..4a1e11f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.mailets.remoteDelivery;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -39,7 +38,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@SuppressWarnings("deprecation")
@@ -215,7 +213,7 @@ public class MailDelivrer {
if (sfe.getValidSentAddresses() != null) {
Address[] validSent = sfe.getValidSentAddresses();
if (validSent.length > 0) {
- LOGGER.debug( "Mail ({}) sent successfully for {}", mail.getName(), Arrays.asList(validSent));
+ LOGGER.debug( "Mail ({}) sent successfully for {}", mail.getName(), validSent);
}
}
@@ -224,9 +222,10 @@ public class MailDelivrer {
throw sfe;
}
- if (sfe.getValidUnsentAddresses() != null && sfe.getValidUnsentAddresses().length > 0) {
+ final Address[] validUnsentAddresses = sfe.getValidUnsentAddresses();
+ if (validUnsentAddresses != null && validUnsentAddresses.length > 0) {
if (configuration.isDebug())
- LOGGER.debug("Send failed, {} valid addresses remain, continuing with any other servers", ImmutableList.copyOf(sfe.getValidUnsentAddresses()));
+ LOGGER.debug("Send failed, {} valid addresses remain, continuing with any other servers", (Object) validUnsentAddresses);
return sfe;
} else {
// There are no valid addresses left to send, so rethrow
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org