diff options
| -rw-r--r-- | Mailman/OutgoingQueue.py | 3 | ||||
| -rw-r--r-- | Mailman/Utils.py | 2 | ||||
| -rwxr-xr-x | mail/contact_transport | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Mailman/OutgoingQueue.py b/Mailman/OutgoingQueue.py index 9022b82ea..3ab43b989 100644 --- a/Mailman/OutgoingQueue.py +++ b/Mailman/OutgoingQueue.py @@ -46,6 +46,3 @@ def enqueueMessage(the_sender, recip, text): marshal.dump((recip,the_sender,text),f) f.close() return fname - - - diff --git a/Mailman/Utils.py b/Mailman/Utils.py index ff927a5c8..4d73e8751 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -179,7 +179,7 @@ def DeliverToUser(msg, recipient, add_headers=[]): text = string.join(msg.headers, '')+ '\n'+ QuotePeriods(msg.body) import OutgoingQueue - OutgoingQueue.enqueueMessage(sender, recipient, text) + queue_id = OutgoingQueue.enqueueMessage(sender, recipient, text) TrySMTPDelivery(recipient,sender,text,queue_id) # Just in case there's still something waiting to be sent... OutgoingQueue.processQueue() diff --git a/mail/contact_transport b/mail/contact_transport index f2b5aa493..8b99138ca 100755 --- a/mail/contact_transport +++ b/mail/contact_transport @@ -30,8 +30,7 @@ from_addr = sys.argv[1] to_addrs = sys.argv[2:] text = sys.stdin.read() -con = smtplib.SmtpConnection(mm_cfg.SMTPHOST) -con.helo(mm_cfg.DEFAULT_HOST_NAME) -con.send(to=to_addrs, frm=from_addr, text=text) -con.quit() +queue_id = Mailman.OutgoingQueue.enqueueMessage(from_addr, to_addrs, text) +TrySMTPDelivery(from_addr, to_addrs, text, queue_id) +Mailman.OutgoingQueue.processQueue() |