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:34:50 UTC
[14/50] [abbrv] james-project git commit: JAMES-2199 Remove some
unnecessary is*Enabled() checks
JAMES-2199 Remove some unnecessary is*Enabled() checks
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/59205a54
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/59205a54
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/59205a54
Branch: refs/heads/master
Commit: 59205a54fd977f63345b8aca9c4d8467363ea8f0
Parents: 00b1a0c
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Thu Oct 19 22:08:27 2017 -0500
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 18 20:31:50 2017 +0100
----------------------------------------------------------------------
.../protocols/smtp/core/esmtp/AuthCmdHandler.java | 6 ++----
.../smtp/core/fastfail/DNSRBLHandler.java | 17 ++++-------------
.../MailRepositoryStoreBeanFactory.java | 4 +---
3 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/59205a54/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index 68732da..818a1a5 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -403,10 +403,8 @@ public class AuthCmdHandler
if (SMTPRetCode.AUTH_FAILED.equals(res.getRetCode())) {
LOGGER.info("AUTH method {} failed", authType);
} else if (SMTPRetCode.AUTH_OK.equals(res.getRetCode())) {
- if (LOGGER.isDebugEnabled()) {
- // TODO: Make this string a more useful debug message
- LOGGER.debug("AUTH method " + authType + " succeeded");
- }
+ // TODO: Make this string a more useful debug message
+ LOGGER.debug("AUTH method {} succeeded", authType);
}
return res;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/59205a54/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
index 6970441..5b6ef06 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
@@ -138,15 +138,10 @@ public class DNSRBLHandler implements RcptHook {
String[] rblList = whitelist;
for (String rbl : rblList) {
if (resolve(reversedOctets + rbl)) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Connection from " + ipAddress + " whitelisted by " + rbl);
- }
-
+ LOGGER.info("Connection from {} whitelisted by {}", ipAddress, rbl);
return;
} else {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("IpAddress " + session.getRemoteAddress().getAddress() + " not listed on " + rbl);
- }
+ LOGGER.debug("IpAddress {} not listed on {}", session.getRemoteAddress().getAddress(), rbl);
}
}
}
@@ -155,9 +150,7 @@ public class DNSRBLHandler implements RcptHook {
String[] rblList = blacklist;
for (String rbl : rblList) {
if (resolve(reversedOctets + rbl)) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Connection from " + ipAddress + " restricted by " + rbl + " to SMTP AUTH/postmaster/abuse.");
- }
+ LOGGER.info("Connection from {} restricted by {} to SMTP AUTH/postmaster/abuse.", ipAddress, rbl);
// we should try to retrieve details
if (getDetail) {
@@ -176,9 +169,7 @@ public class DNSRBLHandler implements RcptHook {
return;
} else {
// if it is unknown, it isn't blocked
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("unknown host exception thrown:" + rbl);
- }
+ LOGGER.debug("unknown host exception thrown: {}", rbl);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/59205a54/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index b6d56ca..9f839a5 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -196,9 +196,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
LOGGER.info("added repository: {}->{}", repID, repClass);
return reply;
} catch (Exception e) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Exception while creating repository:" + e.getMessage(), e);
- }
+ LOGGER.warn("Exception while creating repository: {}", e.getMessage(), e);
throw new MailRepositoryStoreException("Cannot find or init repository", e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org