Revision 35079ab2 logic/dispatcher_callbacks.py
b/logic/dispatcher_callbacks.py | ||
---|---|---|
4 | 4 |
# |
5 | 5 |
# Copyright 2010 Greek Research and Technology Network |
6 | 6 |
# |
7 |
import socket |
|
7 | 8 |
import traceback |
8 | 9 |
import json |
9 | 10 |
import logging |
... | ... | |
83 | 84 |
try: |
84 | 85 |
msg = json.loads(message.body) |
85 | 86 |
|
86 |
email_send.send(frm=msg['frm'], to = msg['to'],
|
|
87 |
email_send.send(sender=msg['frm'], recipient = msg['to'],
|
|
87 | 88 |
body=msg['body'], subject=msg['subject']) |
88 | 89 |
message.channel.basic_ack(message.delivery_tag) |
89 | 90 |
except KeyError: |
90 | 91 |
_logger.error("Malformed incoming JSON, missing attributes: %s", |
91 | 92 |
message.body) |
93 |
except socket.error as e: |
|
94 |
_logger.error("Cannot connect to SMTP server:%s\n", e) |
|
92 | 95 |
except Exception as e: |
93 |
_logger.error("Unexpected error:%s\n%s", |
|
94 |
(e.message,"". |
|
95 |
join(traceback.format_exception(*sys.exc_info())))) |
|
96 |
_logger.error("Unexpected error:%s\n", e) |
|
97 |
raise |
|
96 | 98 |
|
97 | 99 |
|
98 | 100 |
def update_credits(message): |
Also available in: Unified diff