Author: norman
Date: Fri Dec 10 19:30:15 2010
New Revision: 1044485
URL: http://svn.apache.org/viewvc?rev=1044485&view=rev
Log:
Add sender address to logging when deliver to remote host
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1044485&r1=1044484&r2=1044485&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Fri Dec 10 19:30:15 2010
@@ -866,6 +866,16 @@ public class RemoteDelivery extends Gene
while ( targetServers.hasNext()) {
try {
+
+ Properties props = session.getProperties();
+ if (mail.getSender() == null) {
+ props.put("mail.smtp.from", "<>");
+ } else {
+ String sender = mail.getSender().toString();
+ props.put("mail.smtp.from", sender);
+ }
+
+
HostAddress outgoingMailServer = targetServers.next();
StringBuilder logMessageBuffer =
new StringBuilder(256)
@@ -875,18 +885,12 @@ public class RemoteDelivery extends Gene
.append(outgoingMailServer.getHostName())
.append(" at ")
.append(outgoingMailServer.getHost())
+ .append(" from ")
+ .append(props.get("mail.smtp.from"))
.append(" for addresses ")
.append(Arrays.asList(addr));
log(logMessageBuffer.toString());
- Properties props = session.getProperties();
- if (mail.getSender() == null) {
- props.put("mail.smtp.from", "<>");
- } else {
- String sender = mail.getSender().toString();
- props.put("mail.smtp.from", sender);
- }
-
//Many of these properties are only in later JavaMail
versions
//"mail.smtp.ehlo" //default true
//"mail.smtp.auth" //default false
@@ -982,6 +986,8 @@ public class RemoteDelivery extends Gene
.append(outgoingMailServer.getHostName())
.append(" at ")
.append(outgoingMailServer.getHost())
+ .append(" from ")
+ .append(props.get("mail.smtp.from"))
.append(" for ")
.append(mail.getRecipients());
log(logMessageBuffer.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
