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 bt...@apache.org on 2017/08/24 03:46:45 UTC
[20/38] james-project git commit: JAMES-2114 Remove LOGGER from
PROTOCOL Session API
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
index 882bc21..5c41c2b 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
@@ -57,11 +57,14 @@ import org.apache.james.protocols.smtp.hook.MessageHook;
import org.apache.james.smtpserver.model.MailetMailAddressAdapter;
import org.apache.james.smtpserver.model.ProtocolMailAddressAdapter;
import org.apache.mailet.Mail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles the calling of JamesMessageHooks
*/
public class DataLineJamesMessageHookHandler implements DataLineFilter, ExtensibleHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DataLineJamesMessageHookHandler.class);
private List<JamesMessageHook> messageHandlers;
@@ -126,7 +129,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
} catch (MessagingException e) {
// TODO probably return a temporary problem
- session.getLogger().info("Unexpected error handling DATA stream", e);
+ LOGGER.info("Unexpected error handling DATA stream", e);
return new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unexpected error handling DATA stream.");
} finally {
LifecycleUtil.dispose(mimeMessageCopyOnWriteProxy);
@@ -147,12 +150,12 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
} catch (IOException e) {
LifecycleUtil.dispose(mmiss);
SMTPResponse response = new SMTPResponse(SMTPRetCode.LOCAL_ERROR, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.UNDEFINED_STATUS) + " Error processing message: " + e.getMessage());
- session.getLogger().error("Unknown error occurred while processing DATA.", e);
+ LOGGER.error("Unknown error occurred while processing DATA.", e);
return response;
} catch (AddressException e) {
LifecycleUtil.dispose(mmiss);
SMTPResponse response = new SMTPResponse(SMTPRetCode.LOCAL_ERROR, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.UNDEFINED_STATUS) + " Error processing message: " + e.getMessage());
- session.getLogger().error("Invalid email address while processing DATA.", e);
+ LOGGER.error("Invalid email address while processing DATA.", e);
return response;
}
return null;
@@ -165,7 +168,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
OutputStream out;
out = mmiss.getWritableOutputStream();
for (MessageHook rawHandler : mHandlers) {
- session.getLogger().debug("executing james message handler " + rawHandler);
+ LOGGER.debug("executing james message handler " + rawHandler);
long start = System.currentTimeMillis();
HookResult hRes = rawHandler.onMessage(session, new MailToMailEnvelopeWrapper(mail, out));
@@ -173,7 +176,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
if (rHooks != null) {
for (HookResultHook rHook : rHooks) {
- session.getLogger().debug("executing hook " + rHook);
+ LOGGER.debug("executing hook " + rHook);
hRes = rHook.onHookResult(session, hRes, executionTime, rawHandler);
}
}
@@ -188,13 +191,13 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib
}
for (JamesMessageHook messageHandler : messageHandlers) {
- session.getLogger().debug("executing james message handler " + messageHandler);
+ LOGGER.debug("executing james message handler " + messageHandler);
long start = System.currentTimeMillis();
HookResult hRes = messageHandler.onMessage(session, mail);
long executionTime = System.currentTimeMillis() - start;
if (rHooks != null) {
for (HookResultHook rHook : rHooks) {
- session.getLogger().debug("executing hook " + rHook);
+ LOGGER.debug("executing hook " + rHook);
hRes = rHook.onHookResult(session, hRes, executionTime, messageHandler);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
index fb19c67..670586a 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
@@ -32,7 +32,7 @@ public class ExtendedSMTPSession extends org.apache.james.protocols.smtp.SMTPSes
private final SMTPConfiguration smtpConfiguration;
public ExtendedSMTPSession(SMTPConfiguration smtpConfiguration, Logger logger, ProtocolTransport transport) {
- super(logger, transport, smtpConfiguration);
+ super(transport, smtpConfiguration);
this.smtpConfiguration = smtpConfiguration;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
index 30515ae..212e1bd 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
@@ -28,11 +28,14 @@ import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.DataCmdHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* handles DATA command
*/
public class JamesDataCmdHandler extends DataCmdHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JamesDataCmdHandler.class);
@Inject
public JamesDataCmdHandler(MetricFactory metricFactory) {
@@ -51,7 +54,7 @@ public class JamesDataCmdHandler extends DataCmdHandler {
MimeMessageInputStreamSource mmiss = new MimeMessageInputStreamSource(MailImpl.getId());
session.setAttachment(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE, mmiss, State.Transaction);
} catch (Exception e) {
- session.getLogger().warn("Error creating mimemessagesource for incoming data", e);
+ LOGGER.warn("Error creating mimemessagesource for incoming data", e);
return new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unexpected error preparing to receive DATA.");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
index 10cf762..2cf9d52 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
@@ -34,11 +34,14 @@ import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Queue the message
*/
public class SendMailHandler implements JamesMessageHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SendMailHandler.class);
private MailQueue queue;
private MailQueueFactory queueFactory;
@@ -64,7 +67,7 @@ public class SendMailHandler implements JamesMessageHook {
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
- session.getLogger().debug("sending mail");
+ LOGGER.debug("sending mail");
try {
queue.enQueue(mail);
@@ -73,12 +76,12 @@ public class SendMailHandler implements JamesMessageHook {
if (theRecipients != null) {
recipientString = theRecipients.toString();
}
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
String infoBuffer = "Successfully spooled mail " + mail.getName() + " from " + mail.getSender() + " on " + session.getRemoteAddress().getAddress().toString() + " for " + recipientString;
- session.getLogger().info(infoBuffer.toString());
+ LOGGER.info(infoBuffer.toString());
}
} catch (MessagingException me) {
- session.getLogger().error("Unknown error occurred while processing DATA.", me);
+ LOGGER.error("Unknown error occurred while processing DATA.", me);
return new HookResult(HookReturnCode.DENYSOFT, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.UNDEFINED_STATUS) + " Error processing message.");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
index 3740532..9268568 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
@@ -28,11 +28,14 @@ import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.mailet.Mail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Adds the header to the message
*/
public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SetMimeHeaderHandler.class);
/**
* The header name and value that needs to be added
@@ -77,7 +80,7 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
}
} catch (javax.mail.MessagingException me) {
- session.getLogger().error(me.getMessage());
+ LOGGER.error(me.getMessage());
}
return new HookResult(HookReturnCode.DECLINED);
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
index f780975..53b976b 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
@@ -94,10 +94,10 @@ public class TLDLookup {
set.add(multiPartTLD);
}
} catch (Exception ex) {
- debugOut(ex);
+ LOGGER.error("Caught exception", ex);
}
}
- debugOut("initTwoPartTLDs size=" + set.size());
+ LOGGER.debug("initTwoPartTLDs size=" + set.size());
return set;
}
@@ -111,14 +111,14 @@ public class TLDLookup {
for (String multiPartTLD : multiPartTLDs) {
try {
if (multiPartTLD.matches("^" + tld3 + "$")) {
- debugOut("adding \"" + multiPartTLD + "\"");
+ LOGGER.debug("adding \"" + multiPartTLD + "\"");
set.add(multiPartTLD);
}
} catch (Exception ex) {
- debugOut(ex);
+ LOGGER.error("Caught exception", ex);
}
}
- debugOut("initThreePartTLDs size=" + set.size());
+ LOGGER.debug("initThreePartTLDs size=" + set.size());
return set;
}
@@ -164,25 +164,7 @@ public class TLDLookup {
"org.ws", "gov.ws", "edu.ws", "ac.yu", "co.yu", "edu.yu", "org.yu", "com.ye", "net.ye", "org.ye", "gov.ye", "edu.ye", "mil.ye", "ac.za", "alt.za", "bourse.za", "city.za", "co.za", "edu.za", "gov.za", "law.za", "mil.za", "net.za", "ngo.za", "nom.za", "org.za", "school.za", "tm.za",
"web.za", "co.zw", "ac.zw", "org.zw", "gov.zw", "eu.org", "au.com", "br.com", "cn.com", "de.com", "de.net", "eu.com", "gb.com", "gb.net", "hu.com", "no.com", "qc.com", "ru.com", "sa.com", "se.com", "uk.com", "uk.net", "us.com", "uy.com", "za.com", "dk.org", "tel.no", "fax.nr",
"mob.nr", "mobil.nr", "mobile.nr", "tel.nr", "tlf.nr", "e164.arpa" };
- debugOut("array size=" + tmp.length);
+ LOGGER.debug("array size=" + tmp.length);
return tmp;
}
-
- /**
- * Debugging output
- */
- private static void debugOut(String msg) {
- if (testing) {
- LOGGER.debug(msg);
- }
- }
-
- /**
- * Debugging output
- */
- private static void debugOut(Throwable th) {
- if (testing) {
- LOGGER.debug("Error caught", th);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
index deed7a3..f96496a 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
@@ -28,11 +28,14 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This Auth hook can be used to authenticate against the james user repository
*/
public class UsersRepositoryAuthHook implements AuthHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(UsersRepositoryAuthHook.class);
private UsersRepository users;
@@ -68,7 +71,7 @@ public class UsersRepositoryAuthHook implements AuthHook {
return new HookResult(HookReturnCode.OK, "Authentication Successful");
}
} catch (UsersRepositoryException e) {
- session.getLogger().info("Unable to access UsersRepository", e);
+ LOGGER.info("Unable to access UsersRepository", e);
}
return new HookResult(HookReturnCode.DECLINED);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 f213c05..996b281 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
@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
* GreylistHandler which can be used to activate Greylisting
*/
public class JDBCGreylistHandler extends AbstractGreylistHandler implements ProtocolHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JDBCGreylistHandler.class);
/** This log is the fall back shared by all instances */
private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(JDBCGreylistHandler.class);
@@ -386,7 +387,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
if ((wNetworks == null) || (!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress()))) {
return super.doRcpt(session, sender, rcpt);
} else {
- session.getLogger().info("IpAddress " + session.getRemoteAddress().getAddress().getHostAddress() + " is whitelisted. Skip greylisting.");
+ LOGGER.info("IpAddress " + session.getRemoteAddress().getAddress().getHostAddress() + " is whitelisted. Skip greylisting.");
}
return new HookResult(HookReturnCode.DECLINED);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
index b7f1788..523f8b6 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
@@ -44,6 +44,8 @@ import org.slf4j.LoggerFactory;
public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, ProtocolHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SPFHandler.class);
+
/** This log is the fall back shared by all instances */
private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(SPFHandler.class);
@@ -112,7 +114,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
// We have no Sender or HELO/EHLO yet return false
if (sender == null || heloEhlo == null) {
- session.getLogger().info("No Sender or HELO/EHLO present");
+ LOGGER.info("No Sender or HELO/EHLO present");
} else {
String ip = session.getRemoteAddress().getAddress().getHostAddress();
@@ -126,7 +128,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
// Store the header
session.setAttachment(SPF_HEADER, result.getHeaderText(), State.Transaction);
- session.getLogger().info("Result for " + ip + " - " + sender + " - " + heloEhlo + " = " + spfResult);
+ LOGGER.info("Result for " + ip + " - " + sender + " - " + heloEhlo + " = " + spfResult);
// Check if we should block!
if ((spfResult.equals(SPFErrorConstants.FAIL_CONV)) || (spfResult.equals(SPFErrorConstants.SOFTFAIL_CONV) && blockSoftFail) || (spfResult.equals(SPFErrorConstants.PERM_ERROR_CONV) && blockPermError)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
index 8211843..a49db81 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
@@ -33,6 +33,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.smtpserver.JamesMessageHook;
import org.apache.james.util.scanner.SpamAssassinInvoker;
import org.apache.mailet.Mail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -64,6 +66,7 @@ import org.apache.mailet.Mail;
* </p>
*/
public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpamAssassinHandler.class);
/** The port spamd is listen on */
private int spamdPort = 783;
@@ -130,7 +133,7 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
// message
if (spamdRejectionHits <= hits) {
String buffer = "Rejected message from " + session.getAttachment(SMTPSession.SENDER, State.Transaction).toString() + " from host " + session.getRemoteAddress().getHostName() + " (" + session.getRemoteAddress().getAddress().getHostAddress() + ") This message reach the spam hits treshold. Required rejection hits: " + spamdRejectionHits + " hits: " + hits;
- session.getLogger().info(buffer);
+ LOGGER.info(buffer);
// Message reject .. abort it!
return new HookResult(HookReturnCode.DENY, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SECURITY_OTHER) + " This message reach the spam hits treshold. Please contact the Postmaster if the email is not SPAM. Message rejected");
@@ -140,7 +143,7 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
}
}
} catch (MessagingException e) {
- session.getLogger().error(e.getMessage());
+ LOGGER.error(e.getMessage());
}
return new HookResult(HookReturnCode.DECLINED);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
index df5782b..259cbac 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
@@ -53,13 +53,7 @@ import org.slf4j.LoggerFactory;
public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
/** This log is the fall back shared by all instances */
- private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(URIRBLHandler.class);
-
- /**
- * Non context specific log should only be used when no context specific log
- * is available
- */
- private final Logger serviceLog = FALLBACK_LOG;
+ private static final Logger LOGGER = LoggerFactory.getLogger(URIRBLHandler.class);
private final static String LISTED_DOMAIN = "LISTED_DOMAIN";
@@ -157,10 +151,10 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
*/
private HashSet<String> scanMailForDomains(MimePart part, SMTPSession session) throws MessagingException, IOException {
HashSet<String> domains = new HashSet<>();
- session.getLogger().debug("mime type is: \"" + part.getContentType() + "\"");
+ LOGGER.debug("mime type is: \"" + part.getContentType() + "\"");
if (part.isMimeType("text/plain") || part.isMimeType("text/html")) {
- session.getLogger().debug("scanning: \"" + part.getContent().toString() + "\"");
+ LOGGER.debug("scanning: \"" + part.getContent().toString() + "\"");
HashSet<String> newDom = URIScanner.scanContentForDomains(domains, part.getContent().toString());
// Check if new domains are found and add the domains
@@ -170,10 +164,10 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
} else if (part.isMimeType("multipart/*")) {
MimeMultipart multipart = (MimeMultipart) part.getContent();
int count = multipart.getCount();
- session.getLogger().debug("multipart count is: " + count);
+ LOGGER.debug("multipart count is: " + count);
for (int index = 0; index < count; index++) {
- session.getLogger().debug("recursing index: " + index);
+ LOGGER.debug("recursing index: " + index);
MimeBodyPart mimeBodyPart = (MimeBodyPart) multipart.getBodyPart(index);
HashSet<String> newDomains = scanMailForDomains(mimeBodyPart, session);
@@ -206,8 +200,8 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
String uRblServer = uRbl.next();
String address = target + "." + uRblServer;
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug("Lookup " + address);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Lookup " + address);
}
dnsService.getByName(address);
@@ -224,7 +218,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
}
}
} catch (MessagingException | IOException e) {
- session.getLogger().error(e.getMessage());
+ LOGGER.error(e.getMessage());
}
return false;
}
@@ -235,8 +229,8 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
Collection<String> serverCollection = new ArrayList<>();
for (String rblServerName : servers) {
serverCollection.add(rblServerName);
- if (serviceLog.isInfoEnabled()) {
- serviceLog.info("Adding uriRBL server: " + rblServerName);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Adding uriRBL server: " + rblServerName);
}
}
if (serverCollection != null && serverCollection.size() > 0) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
index 04c450e..16d49e8 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
@@ -29,8 +29,11 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.james.smtpserver.TLDLookup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class URIScanner {
+ private static final Logger LOGGER = LoggerFactory.getLogger(URIScanner.class);
// These regular expressions "inspired" by Spamassassin
static private final String reserved = ";/?:@&=+$,[]\\#|";
@@ -248,9 +251,9 @@ public class URIScanner {
mat = emailAddrPattern.matcher(content);
while (mat.find()) {
String found = mat.group();
- debugOut("******** mailfound=\"" + found + "\"");
+ LOGGER.debug("******** mailfound=\"" + found + "\"");
found = "mailto://" + found;
- debugOut("*******6 mailfoundfound=\"" + found + "\" after cleanup 6");
+ LOGGER.debug("*******6 mailfoundfound=\"" + found + "\" after cleanup 6");
String host = hostFromUriStr(found);
if (null != host) {
@@ -275,14 +278,14 @@ public class URIScanner {
* could be found
*/
static protected String hostFromUriStr(String uriStr) {
- debugOut("hostFromUriStr(\"" + uriStr + "\")");
+ LOGGER.debug("hostFromUriStr(\"" + uriStr + "\")");
String host = null;
URI uri;
try {
uri = new URI(uriStr);
host = uri.getHost();
} catch (URISyntaxException e) {
- debugOut(e.getMessage());
+ LOGGER.error("Caught exception", e);
}
return host;
}
@@ -301,7 +304,7 @@ public class URIScanner {
* @return the registrar domain portion of the supplied host string
*/
static protected String domainFromHost(String host) {
- debugOut("domainFromHost(\"" + host + "\")");
+ LOGGER.debug("domainFromHost(\"" + host + "\")");
String domain = null;
Matcher mat;
@@ -310,7 +313,7 @@ public class URIScanner {
if (mat.find()) {
// reverse the octets now
domain = mat.group(5) + "." + mat.group(4) + "." + mat.group(3) + "." + mat.group(2);
- debugOut("domain=\"" + domain + "\"");
+ LOGGER.debug("domain=\"" + domain + "\"");
return domain;
}
@@ -320,7 +323,7 @@ public class URIScanner {
String tld = mat.group(2);
if (TLDLookup.isThreePartTLD(tld)) {
domain = mat.group(1);
- debugOut("domain=\"" + domain + ", tld=\"" + tld + "\"");
+ LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\"");
return domain;
}
}
@@ -331,7 +334,7 @@ public class URIScanner {
String tld = mat.group(2);
if (TLDLookup.isTwoPartTLD(tld)) {
domain = mat.group(1);
- debugOut("domain=\"" + domain + ", tld=\"" + tld + "\"");
+ LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\"");
return domain;
}
}
@@ -341,24 +344,13 @@ public class URIScanner {
if (mat.find()) {
String tld = mat.group(2);
domain = mat.group(1);
- debugOut("domain=\"" + domain + ", tld=\"" + tld + "\"");
+ LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\"");
return domain;
}
return domain;
}
/**
- * Debugging output
- */
- private static void debugOut(String msg) {
- /* controls testing/debug output */
- boolean testing = false;
- if (testing) {
- System.out.println(msg);
- }
- }
-
- /**
* A utility function that "escapes" special characters in a string.
*
* @param str
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
index 782a550..7d4362f 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
@@ -34,11 +34,14 @@ import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handler which reject invalid recipients
*/
public class ValidRcptHandler extends AbstractValidRcptHandler implements ProtocolHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ValidRcptHandler.class);
private UsersRepository users;
@@ -105,7 +108,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
} else {
if (useVut) {
- session.getLogger().debug("Unknown user " + username + " check if its an alias");
+ LOGGER.debug("Unknown user " + username + " check if its an alias");
try {
Mappings targetString = vut.getMappings(recipient.getLocalPart(), recipient.getDomain());
@@ -116,7 +119,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
} catch (ErrorMappingException e) {
return false;
} catch (RecipientRewriteTableException e) {
- session.getLogger().info("Unable to access RecipientRewriteTable", e);
+ LOGGER.info("Unable to access RecipientRewriteTable", e);
return false;
}
}
@@ -124,7 +127,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
return false;
}
} catch (UsersRepositoryException e) {
- session.getLogger().info("Unable to access UsersRepository", e);
+ LOGGER.info("Unable to access UsersRepository", e);
return false;
}
@@ -140,7 +143,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
try {
return domains.containsDomain(domain);
} catch (DomainListException e) {
- session.getLogger().error("Unable to get domains", e);
+ LOGGER.error("Unable to get domains", e);
return false;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
index 62e35b3..3f2da70 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
@@ -103,11 +103,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler {
* @param dnsServer The DNSServer
*/
public void setBannedNetworks(Collection<String> networks, DNSService dnsServer) {
- bNetwork = new NetMatcher(networks, dnsServer) {
- protected void log(String s) {
- serviceLog.debug(s);
- }
- };
+ bNetwork = new NetMatcher(networks, dnsServer);
}
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
index 64ae9b6..7628039 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
@@ -30,7 +30,6 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.MessageEvent;
-import org.slf4j.Logger;
/**
* {@link ChannelUpstreamHandler} which is used by the SMTPServer
@@ -40,12 +39,12 @@ public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
private final SmtpMetrics smtpMetrics;
- public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger, Encryption encryption, SmtpMetrics smtpMetrics) {
+ public SMTPChannelUpstreamHandler(Protocol protocol, Encryption encryption, SmtpMetrics smtpMetrics) {
super(protocol, encryption);
this.smtpMetrics = smtpMetrics;
}
- public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger, SmtpMetrics smtpMetrics) {
+ public SMTPChannelUpstreamHandler(Protocol protocol, SmtpMetrics smtpMetrics) {
super(protocol);
this.smtpMetrics = smtpMetrics;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
index 46e74de..e8d48c2 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
@@ -111,7 +111,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
}
authorizedNetworks = new NetMatcher(networks, dns);
}
- SMTPProtocol transport = new SMTPProtocol(getProtocolHandlerChain(), theConfigData, getLogger()) {
+ SMTPProtocol transport = new SMTPProtocol(getProtocolHandlerChain(), theConfigData) {
@Override
public ProtocolSession newSession(ProtocolTransport transport) {
@@ -119,7 +119,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe
}
};
- coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(), getEncryption(), smtpMetrics);
+ coreHandler = new SMTPChannelUpstreamHandler(transport, getEncryption(), smtpMetrics);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org