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 pg...@apache.org on 2002/10/02 09:27:45 UTC
cvs commit: jakarta-james/src/java/org/apache/james/transport/mailets Redirect.java RemoteDelivery.java ServerTime.java ToProcessor.java UseHeaderRecipients.java
pgoldstein 2002/10/02 00:27:44
Modified: src/java/org/apache/james/transport/mailets Redirect.java
RemoteDelivery.java ServerTime.java
ToProcessor.java UseHeaderRecipients.java
Log:
Added a DEBUG value to some of the mailets, to control the logged strings for these mailets.
Thanks to Noel Bergman for the fix.
Revision Changes Path
1.16 +28 -15 jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java
Index: Redirect.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Redirect.java 27 Sep 2002 11:33:13 -0000 1.15
+++ Redirect.java 2 Oct 2002 07:27:44 -0000 1.16
@@ -195,6 +195,11 @@
*/
public class Redirect extends GenericMailet {
+ /**
+ * Controls certain log messages
+ */
+ private final boolean DEBUG = false;
+
// The values that indicate how to attach the original mail
// to the redirected mail.
@@ -419,23 +424,27 @@
*
*/
public void init() throws MessagingException {
- log("redirect init");
+ if (DEBUG) {
+ log("Redirect init");
+ }
if(isStatic()) {
- sender = (getSender() == null) ? getMailetContext().getPostmaster() : getSender();
- replyTo = (getReplyTo() == null) ? getMailetContext().getPostmaster() : getReplyTo();
+ sender = getSender();
+ replyTo = getReplyTo();
messageText = getMessage();
recipients = getRecipients();
apparentlyTo = getTo();
- StringBuffer logBuffer =
- new StringBuffer(1024)
- .append("static, sender=")
- .append(sender)
- .append(", replyTo=")
- .append(replyTo)
- .append(", message=")
- .append(messageText)
- .append(" ");
- log(logBuffer.toString());
+ if (DEBUG) {
+ StringBuffer logBuffer =
+ new StringBuffer(1024)
+ .append("static, sender=")
+ .append(sender)
+ .append(", replyTo=")
+ .append(replyTo)
+ .append(", message=")
+ .append(messageText)
+ .append(" ");
+ log(logBuffer.toString());
+ }
}
}
@@ -458,7 +467,9 @@
MimeMessage reply = null;
//Create the message
if(getInLineType() != UNALTERED) {
- log("alter message inline=:" + getInLineType());
+ if (DEBUG) {
+ log("Alter message inline=:" + getInLineType());
+ }
reply = new MimeMessage(Session.getDefaultInstance(System.getProperties(),
null));
StringWriter sout = new StringWriter();
@@ -535,7 +546,9 @@
} else {
// if we need the original, create a copy of this message to redirect
reply = getPassThrough() ? new MimeMessage(message) : message;
- log("message resent unaltered:");
+ if (DEBUG) {
+ log("Message resent unaltered.");
+ }
}
//Set additional headers
reply.setSubject(getSubjectPrefix() + message.getSubject());
1.29 +34 -21 jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- RemoteDelivery.java 30 Sep 2002 23:38:58 -0000 1.28
+++ RemoteDelivery.java 2 Oct 2002 07:27:44 -0000 1.29
@@ -57,6 +57,11 @@
*/
public class RemoteDelivery extends GenericMailet implements Runnable {
+ /**
+ * Controls certain log messages
+ */
+ private final boolean DEBUG = false;
+
private SpoolRepository outgoing; // The spool of outgoing mail
private long delayTime = 21600000; // default is 6*60*60*1000 millis (6 hours)
private int maxRetries = 5; // default number of retries
@@ -146,7 +151,9 @@
*/
private boolean deliver(MailImpl mail, Session session) {
try {
- log("attempting to deliver " + mail.getName());
+ if (DEBUG) {
+ log("attempting to deliver " + mail.getName());
+ }
MimeMessage message = mail.getMessage();
//Create an array of the recipients as InternetAddress objects
@@ -190,7 +197,7 @@
String outgoingmailserver = i.next().toString ();
StringBuffer logMessageBuffer =
new StringBuffer(256)
- .append("attempting delivery of ")
+ .append("Attempting delivery of ")
.append(mail.getName())
.append(" to host ")
.append(outgoingmailserver)
@@ -229,7 +236,7 @@
}
logMessageBuffer =
new StringBuffer(256)
- .append("mail (")
+ .append("Mail (")
.append(mail.getName())
.append(") sent successfully to ")
.append(outgoingmailserver);
@@ -281,7 +288,7 @@
throw lastError;
}
} else {
- log("no recipients specified... not sure how this could have happened.");
+ log("No recipients specified... not sure how this could have happened.");
}
} catch (SendFailedException sfe) {
//Would like to log all the types of email addresses
@@ -413,9 +420,9 @@
try {
getMailetContext().bounce(mail, sout.toString());
} catch (MessagingException me) {
- log("encountered unexpected messaging exception while bouncing message: " + me.getMessage());
+ log("Encountered unexpected messaging exception while bouncing message: " + me.getMessage());
} catch (Exception e) {
- log("encountered unexpected exception while bouncing message: " + e.getMessage());
+ log("Encountered unexpected exception while bouncing message: " + e.getMessage());
}
}
@@ -436,7 +443,9 @@
MailImpl mail = (MailImpl)genericmail;
//Do I want to give the internal key, or the message's Message ID
- log("Remotely delivering mail " + mail.getName());
+ if (DEBUG) {
+ log("Remotely delivering mail " + mail.getName());
+ }
Collection recipients = mail.getRecipients();
//Must first organize the recipients into distinct servers (name made case insensitive)
@@ -460,13 +469,15 @@
for (Iterator i = targets.keySet().iterator(); i.hasNext(); ) {
String host = (String) i.next();
Collection rec = (Collection) targets.get(host);
- StringBuffer logMessageBuffer =
- new StringBuffer(128)
- .append("sending mail to ")
- .append(rec)
- .append(" on host ")
- .append(host);
- log(logMessageBuffer.toString());
+ if (DEBUG) {
+ StringBuffer logMessageBuffer =
+ new StringBuffer(128)
+ .append("Sending mail to ")
+ .append(rec)
+ .append(" on host ")
+ .append(host);
+ log(logMessageBuffer.toString());
+ }
mail.setRecipients(rec);
StringBuffer nameBuffer =
new StringBuffer(128)
@@ -539,12 +550,14 @@
try {
String key = outgoing.accept(delayTime);
try {
- StringBuffer logMessageBuffer =
- new StringBuffer(128)
- .append(Thread.currentThread().getName())
- .append(" will process mail ")
- .append(key);
- log(logMessageBuffer.toString());
+ if (DEBUG) {
+ StringBuffer logMessageBuffer =
+ new StringBuffer(128)
+ .append(Thread.currentThread().getName())
+ .append(" will process mail ")
+ .append(key);
+ log(logMessageBuffer.toString());
+ }
MailImpl mail = outgoing.retrieve(key);
// Retrieve can return null if the mail is no longer on the outgoing spool.
// In this case we simply continue to the next key
1.5 +0 -1 jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java
Index: ServerTime.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerTime.java 19 Aug 2002 18:57:07 -0000 1.4
+++ ServerTime.java 2 Oct 2002 07:27:44 -0000 1.5
@@ -33,7 +33,6 @@
* @throws MessagingException if an error is encountered while formulating the reply message
*/
public void service(Mail mail) throws javax.mail.MessagingException {
- log("Sending timestamp");
MimeMessage response = (MimeMessage)mail.getMessage().reply(false);
response.setSubject("The time is now...");
StringBuffer textBuffer =
1.6 +15 -9 jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java
Index: ToProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ToProcessor.java 23 Aug 2002 08:00:29 -0000 1.5
+++ ToProcessor.java 2 Oct 2002 07:27:44 -0000 1.6
@@ -14,8 +14,7 @@
import javax.mail.MessagingException;
/**
- * No idea what this class is for..... seems to send processor of a message to
- * another mailet (which I didn't think we were supporting)
+ * This mailet redirects the mail to the named processor
*
* Sample configuration:
* <mailet match="All" class="ToProcessor">
@@ -29,6 +28,11 @@
public class ToProcessor extends GenericMailet {
/**
+ * Controls certain log messages
+ */
+ private final boolean DEBUG = false;
+
+ /**
* The name of the processor to which this mailet forwards mail
*/
String processor;
@@ -59,13 +63,15 @@
* @throws MessagingException in all cases
*/
public void service(Mail mail) throws MessagingException {
- StringBuffer logBuffer =
- new StringBuffer(128)
- .append("Sending mail ")
- .append(mail)
- .append(" to ")
- .append(processor);
- log(logBuffer.toString());
+ if (DEBUG) {
+ StringBuffer logBuffer =
+ new StringBuffer(128)
+ .append("Sending mail ")
+ .append(mail)
+ .append(" to ")
+ .append(processor);
+ log(logBuffer.toString());
+ }
mail.setState(processor);
if (noticeText != null) {
if (mail.getErrorMessage() == null) {
1.5 +21 -9 jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
Index: UseHeaderRecipients.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UseHeaderRecipients.java 19 Aug 2002 18:57:07 -0000 1.4
+++ UseHeaderRecipients.java 2 Oct 2002 07:27:44 -0000 1.5
@@ -44,6 +44,11 @@
public class UseHeaderRecipients extends GenericMailet {
/**
+ * Controls certain log messages
+ */
+ private final boolean DEBUG = false;
+
+ /**
* Process an incoming email, removing the currently identified
* recipients and replacing them with the recipients indicated in
* the Mail-For, To and Cc headers of the actual email.
@@ -65,9 +70,11 @@
recipients.addAll(getHeaderMailAddresses(message, "To"));
recipients.addAll(getHeaderMailAddresses(message, "Cc"));
}
- log("All recipients = " + recipients.toString());
+ if (DEBUG) {
+ log("All recipients = " + recipients.toString());
+ log("Reprocessing mail using recipients in message headers");
+ }
- log("Reprocessing mail using recipients in message headers");
// Return email to the "root" process.
getMailetContext().sendMail(mail.getSender(), mail.getRecipients(), mail.getMessage());
mail.setState(Mail.GHOST);
@@ -92,12 +99,15 @@
* @return the collection of MailAddress objects.
*/
private Collection getHeaderMailAddresses(MimeMessage message, String name) throws MessagingException {
- StringBuffer logBuffer =
- new StringBuffer(64)
- .append("Checking ")
- .append(name)
- .append(" headers");
- log(logBuffer.toString());
+
+ if (DEBUG) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Checking ")
+ .append(name)
+ .append(" headers");
+ log(logBuffer.toString());
+ }
Collection addresses = new Vector();
String[] headers = message.getHeader(name);
String addressString;
@@ -108,7 +118,9 @@
while (st.hasMoreTokens()) {
addressString = st.nextToken();
iAddress = new InternetAddress(addressString);
- log("Address = " + iAddress.toString());
+ if (DEBUG) {
+ log("Address = " + iAddress.toString());
+ }
addresses.add(new MailAddress(iAddress));
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>