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:19 UTC
[43/50] [abbrv] james-project git commit: JAMES-2199 Utilize
parameterized logging and remove toString() calls
JAMES-2199 Utilize parameterized logging and remove toString() calls
As suggested in the SLF4J FAQ:
https://www.slf4j.org/faq.html#logging_performance
.. parameterized logging can improve the efficiency of logger calls when
logging at the specified level is disabled.
In addition, per the FAQ: https://www.slf4j.org/faq.html#paramException
since SLF4J 1.6.0 it is possible to use parameterized logging and also
log an exception/throwable.
toString() is called automatically:
https://www.slf4j.org/faq.html#string_contents
These changes were suggested 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/e5d8eda7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e5d8eda7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e5d8eda7
Branch: refs/heads/master
Commit: e5d8eda73f040c0f8aee323083d0fb2a7ed73103
Parents: 24b497a
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Wed Dec 6 20:36:45 2017 -0600
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 18 20:31:55 2017 +0100
----------------------------------------------------------------------
.../james/mailbox/copier/MailboxCopierImpl.java | 16 +++++--------
.../james/ai/classic/JDBCBayesianAnalyzer.java | 4 +---
.../james/metrics/logger/DefaultTimeMetric.java | 2 +-
.../smtp/core/log/HookResultLogger.java | 4 ++--
.../james/app/spring/JamesAppSpringMain.java | 2 +-
.../util/bayesian/JDBCBayesianAnalyzer.java | 4 +---
.../james/transport/mailets/FromRepository.java | 4 ++--
.../transport/mailets/WhiteListManager.java | 4 +---
.../mailets/jsieve/CommonsLoggingAdapter.java | 24 ++++++++++----------
.../matchers/AbstractSQLWhitelistMatcher.java | 4 +---
.../apache/james/fetchmail/FolderProcessor.java | 13 ++---------
.../apache/james/fetchmail/StoreProcessor.java | 18 ++-------------
.../netty/AbstractConfigurableAsyncServer.java | 12 ++++------
.../ManageSieveChannelUpstreamHandler.java | 4 ++--
.../fastfail/JDBCGreylistHandler.java | 4 +---
15 files changed, 39 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
index 1f1f238..3bf03d7 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
@@ -91,7 +91,7 @@ public class MailboxCopierImpl implements MailboxCopier {
if ((mailboxPath.getName() != null) && (mailboxPath.getName().trim().length() > 0)) {
- LOGGER.info("Ready to copy source mailbox path=" + mailboxPath.toString());
+ LOGGER.info("Ready to copy source mailbox path={}", mailboxPath);
srcMailboxSession = srcMailboxManager.createSystemSession(mailboxPath.getUser());
dstMailboxSession = dstMailboxManager.createSystemSession(mailboxPath.getUser());
@@ -99,11 +99,9 @@ public class MailboxCopierImpl implements MailboxCopier {
dstMailboxManager.startProcessingRequest(dstMailboxSession);
try {
dstMailboxManager.createMailbox(mailboxPath, dstMailboxSession);
- LOGGER.info("Destination mailbox " + i + "/" + mailboxPathList.size()
- + " created with path=" + mailboxPath.toString()
- + " after " + (Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis()) + " ms.");
+ LOGGER.info("Destination mailbox {}/{} created with path={} after {} ms.", i, mailboxPathList.size(), mailboxPath, Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis());
} catch (MailboxExistsException e) {
- LOGGER.error("Mailbox " + i + " with path=" + mailboxPath.toString() + " already exists.", e);
+ LOGGER.error("Mailbox {} with path={} already exists.", i, mailboxPath, e);
}
dstMailboxManager.endProcessingRequest(dstMailboxSession);
@@ -125,7 +123,7 @@ public class MailboxCopierImpl implements MailboxCopier {
dstMailboxManager.startProcessingRequest(dstMailboxSession);
dstMessageManager.appendMessage(content.getInputStream(), messageResult.getInternalDate(), dstMailboxSession, messageResult.getFlags().contains(Flag.RECENT), messageResult.getFlags());
dstMailboxManager.endProcessingRequest(dstMailboxSession);
- LOGGER.info("MailboxMessage #" + j + " appended in destination mailbox with path=" + mailboxPath.toString());
+ LOGGER.info("MailboxMessage #{} appended in destination mailbox with path={}", j, mailboxPath);
j++;
}
@@ -135,15 +133,13 @@ public class MailboxCopierImpl implements MailboxCopier {
else {
- LOGGER.info("Destination mailbox " + i + "/" + mailboxPathList.size()
- + " with path=" + mailboxPath.toString()
- + " has a null or empty name");
+ LOGGER.info("Destination mailbox {}/{} with path={} has a null or empty name", i, mailboxPathList.size(), mailboxPath);
}
}
- LOGGER.info("Mailboxes copied in " + (Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis()) + " ms.");
+ LOGGER.info("Mailboxes copied in {} ms.", Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
index 4ca0e12..20def31 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
@@ -404,9 +404,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer = null;
- logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- LOGGER.debug(logBuffer.toString());
+ LOGGER.debug("Created table '{}' using sqlResources string '{}'.", tableName, createSqlStringName);
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultTimeMetric.java
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultTimeMetric.java b/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultTimeMetric.java
index 24da728..13f5609 100644
--- a/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultTimeMetric.java
+++ b/metrics/metrics-logger/src/main/java/org/apache/james/metrics/logger/DefaultTimeMetric.java
@@ -42,7 +42,7 @@ public class DefaultTimeMetric implements TimeMetric {
@Override
public long stopAndPublish() {
long elapsed = stopwatch.elapsed(TimeUnit.MILLISECONDS);
- DefaultMetricFactory.LOGGER.info("Time spent in " + name + ": " + elapsed + " ms.");
+ DefaultMetricFactory.LOGGER.info("Time spent in {}: {} ms.", name, elapsed);
return elapsed;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
index 37ea742..adf9017 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
@@ -84,9 +84,9 @@ public class HookResultLogger implements HookResultHook {
sb.append(")");
if (info) {
- LOGGER.info(sb.toString());
+ LOGGER.info("{}", sb);
} else {
- LOGGER.debug(sb.toString());
+ LOGGER.debug("{}", sb);
}
return hResult;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
----------------------------------------------------------------------
diff --git a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
index 1ca6e89..33fb831 100644
--- a/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
+++ b/server/app/src/main/java/org/apache/james/app/spring/JamesAppSpringMain.java
@@ -43,7 +43,7 @@ public class JamesAppSpringMain implements Daemon {
long end = Calendar.getInstance().getTimeInMillis();
- log.info("Apache James Server is successfully started in " + (end - start) + " milliseconds.");
+ log.info("Apache James Server is successfully started in {} milliseconds.", end - start);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
index b7df56d..a56b6bc 100644
--- a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
+++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
@@ -402,9 +402,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer;
- logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- LOGGER.error(logBuffer.toString());
+ LOGGER.error("Created table '{}' using sqlResources string '{}'.", tableName, createSqlStringName);
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
index f6cd581..3f43a0f 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
@@ -106,7 +106,7 @@ public class FromRepository extends GenericMailet {
try {
Mail mail = repository.retrieve(key);
if (mail != null && mail.getRecipients() != null) {
- LOGGER.debug((new StringBuffer(160).append("Spooling mail ").append(mail.getName()).append(" from ").append(repositoryPath)).toString());
+ LOGGER.debug("Spooling mail {} from {}", mail.getName(), repositoryPath);
mail.setAttribute("FromRepository", Boolean.TRUE);
mail.setState(processor);
@@ -116,7 +116,7 @@ public class FromRepository extends GenericMailet {
LifecycleUtil.dispose(mail);
}
} catch (MessagingException e) {
- LOGGER.error((new StringBuffer(160).append("Unable to re-spool mail ").append(key).append(" from ").append(repositoryPath)).toString(), e);
+ LOGGER.error("Unable to re-spool mail {} from {}", key, repositoryPath, e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
index db5e4f6..b0fcffe 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
@@ -804,9 +804,7 @@ public class WhiteListManager extends GenericMailet {
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer;
- logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- LOGGER.info(logBuffer.toString());
+ LOGGER.info("Created table '{}' using sqlResources string '{}'.", tableName, createSqlStringName);
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/CommonsLoggingAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/CommonsLoggingAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/CommonsLoggingAdapter.java
index 2e7293b..11a7a42 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/CommonsLoggingAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/CommonsLoggingAdapter.java
@@ -91,49 +91,49 @@ public class CommonsLoggingAdapter implements Log {
public void debug(Object message) {
if (isDebugEnabled()) {
- logger.debug(message == null ? "NULL" : message.toString());
+ logger.debug("{}", (message == null ? "NULL" : message));
}
}
public void debug(Object message, Throwable t) {
if (isDebugEnabled()) {
- logger.debug(message == null ? "NULL" : message.toString(), t);
+ logger.debug("{}", (message == null ? "NULL" : message), t);
}
}
public void error(Object message) {
if (isErrorEnabled()) {
- logger.error(message == null ? "NULL" : message.toString());
+ logger.error("{}", (message == null ? "NULL" : message));
}
}
public void error(Object message, Throwable t) {
if (isErrorEnabled()) {
- logger.error(message == null ? "NULL" : message.toString(), t);
+ logger.error("{}", (message == null ? "NULL" : message), t);
}
}
public void fatal(Object message) {
if (isFatalEnabled()) {
- logger.error(message == null ? "NULL" : message.toString());
+ logger.error("{}", (message == null ? "NULL" : message));
}
}
public void fatal(Object message, Throwable t) {
if (isFatalEnabled()) {
- logger.error(message == null ? "NULL" : message.toString(), t);
+ logger.error("{}", (message == null ? "NULL" : message), t);
}
}
public void info(Object message) {
if (isInfoEnabled()) {
- logger.info(message == null ? "NULL" : message.toString());
+ logger.info("{}", (message == null ? "NULL" : message));
}
}
public void info(Object message, Throwable t) {
if (isInfoEnabled()) {
- logger.info(message == null ? "NULL" : message.toString(), t);
+ logger.info("{}", (message == null ? "NULL" : message), t);
}
}
@@ -163,25 +163,25 @@ public class CommonsLoggingAdapter implements Log {
public void trace(Object message) {
if (isTraceEnabled()) {
- logger.debug(message == null ? "NULL" : message.toString());
+ logger.debug("{}", (message == null ? "NULL" : message));
}
}
public void trace(Object message, Throwable t) {
if (isTraceEnabled()) {
- logger.debug(message == null ? "NULL" : message.toString(), t);
+ logger.debug("{}", (message == null ? "NULL" : message), t);
}
}
public void warn(Object message) {
if (isWarnEnabled()) {
- logger.warn(message == null ? "NULL" : message.toString());
+ logger.warn("{}", (message == null ? "NULL" : message));
}
}
public void warn(Object message, Throwable t) {
if (isWarnEnabled()) {
- logger.warn(message == null ? "NULL" : message.toString(), t);
+ logger.warn("{}", (message == null ? "NULL" : message), t);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
index d0846d0..40477b3 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
@@ -261,9 +261,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher {
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer;
- logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- LOGGER.info(logBuffer.toString());
+ LOGGER.info("Created table '{}' using sqlResources string '{}'.", tableName, createSqlStringName);
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
index ac1a950..119e5a4 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
@@ -92,9 +92,7 @@ public class FolderProcessor extends ProcessorAbstract {
// Catch and report an exception but don't rethrow it,
// allowing subsequent messages to be processed.
catch (Exception ex) {
- StringBuilder logMessageBuffer = new StringBuilder("Exception processing message ID: ");
- logMessageBuffer.append(message.getMessageID());
- LOGGER.error(logMessageBuffer.toString(), ex);
+ LOGGER.error("Exception processing message ID: {}", message.getMessageID(), ex);
}
}
}
@@ -108,14 +106,7 @@ public class FolderProcessor extends ProcessorAbstract {
} catch (MessagingException ex) {
// No-op
}
- StringBuilder logMessageBuffer = new StringBuilder("Processed ");
- logMessageBuffer.append(messagesProcessed);
- logMessageBuffer.append(" messages of ");
- logMessageBuffer.append(messageCount);
- logMessageBuffer.append(" in folder '");
- logMessageBuffer.append(getFolder().getName());
- logMessageBuffer.append("'");
- LOGGER.info(logMessageBuffer.toString());
+ LOGGER.info("Processed {} messages of {} in folder '{}'", messagesProcessed, messageCount, getFolder().getName());
}
// Recurse through sub-folders if required
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
index d853917..d9cb43e 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
@@ -53,14 +53,7 @@ public class StoreProcessor extends ProcessorAbstract {
Store store = null;
Folder folder;
- StringBuilder logMessageBuffer = new StringBuilder("Starting fetching mail from server '");
- logMessageBuffer.append(getHost());
- logMessageBuffer.append("' for user '");
- logMessageBuffer.append(getUser());
- logMessageBuffer.append("' in folder '");
- logMessageBuffer.append(getJavaMailFolderName());
- logMessageBuffer.append("'");
- LOGGER.info(logMessageBuffer.toString());
+ LOGGER.info("Starting fetching mail from server '{}' for user '{}' in folder '{}'", getHost(), getUser(), getJavaMailFolderName());
try {
// Get a Store object
@@ -89,14 +82,7 @@ public class StoreProcessor extends ProcessorAbstract {
} catch (MessagingException ex) {
LOGGER.error("A MessagingException occured while closing the Store", ex);
}
- logMessageBuffer = new StringBuilder("Finished fetching mail from server '");
- logMessageBuffer.append(getHost());
- logMessageBuffer.append("' for user '");
- logMessageBuffer.append(getUser());
- logMessageBuffer.append("' in folder '");
- logMessageBuffer.append(getJavaMailFolderName());
- logMessageBuffer.append("'");
- LOGGER.info(logMessageBuffer.toString());
+ LOGGER.info("Finished fetching mail from server '{}' for user '{}' in folder '{}'", getHost(), getUser(), getJavaMailFolderName());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 9d0a1ca..e4538bb 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -194,13 +194,11 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
setTimeout(config.getInt(TIMEOUT_NAME, DEFAULT_TIMEOUT));
- StringBuilder infoBuffer = new StringBuilder(64).append(getServiceType()).append(" handler connection timeout is: ").append(getTimeout());
- LOGGER.info(infoBuffer.toString());
+ LOGGER.info("{} handler connection timeout is: {}", getServiceType(), getTimeout());
setBacklog(config.getInt(BACKLOG_NAME, DEFAULT_BACKLOG));
- infoBuffer = new StringBuilder(64).append(getServiceType()).append(" connection backlog is: ").append(getBacklog());
- LOGGER.info(infoBuffer.toString());
+ LOGGER.info("{} connection backlog is: {}", getServiceType(), getBacklog());
String connectionLimitString = config.getString("connectionLimit", null);
if (connectionLimitString != null) {
@@ -213,8 +211,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
LOGGER.error("Connection limit value cannot be less than zero.");
throw new ConfigurationException("Connection limit value cannot be less than zero.");
} else if (connectionLimit > 0) {
- infoBuffer = new StringBuilder(128).append(getServiceType()).append(" will allow a maximum of ").append(connectionLimitString).append(" connections.");
- LOGGER.info(infoBuffer.toString());
+ LOGGER.info("{} will allow a maximum of {} connections.", getServiceType(), connectionLimitString);
}
}
@@ -229,8 +226,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
LOGGER.error("Connection limit per IP value cannot be less than zero.");
throw new ConfigurationException("Connection limit value cannot be less than zero.");
} else if (connPerIP > 0) {
- infoBuffer = new StringBuilder(128).append(getServiceType()).append(" will allow a maximum of ").append(connPerIP).append(" per IP connections for ").append(getServiceType());
- LOGGER.info(infoBuffer.toString());
+ LOGGER.info("{} will allow a maximum of {} per IP connections for {}", getServiceType(), connPerIP, getServiceType());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
index 8f63517..28422ae 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
@@ -107,7 +107,7 @@ public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHand
public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
try (Closeable closeable = ManageSieveMDCContext.from(ctx, attributes)) {
InetSocketAddress address = (InetSocketAddress) ctx.getChannel().getRemoteAddress();
- logger.info("Connection established from " + address.getAddress().getHostAddress());
+ logger.info("Connection established from {}", address.getAddress().getHostAddress());
Session session = new SettableSession();
if (sslServer) {
@@ -124,7 +124,7 @@ public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHand
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
try (Closeable closeable = ManageSieveMDCContext.from(ctx, attributes)) {
InetSocketAddress address = (InetSocketAddress) ctx.getChannel().getRemoteAddress();
- logger.info("Connection closed for " + address.getAddress().getHostAddress());
+ logger.info("Connection closed for {}", address.getAddress().getHostAddress());
attributes.remove(ctx.getChannel());
super.channelClosed(ctx, e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e5d8eda7/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
index 0a9ee32..f1441c5 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
@@ -355,9 +355,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuilder logBuffer;
- logBuffer = new StringBuilder(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
- LOGGER.info(logBuffer.toString());
+ LOGGER.info("Created table '{}' using sqlResources string '{}'.", tableName, createSqlStringName);
} finally {
theJDBCUtil.closeJDBCStatement(createStatement);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org