Revision 86f046a8 invitations/invitations.py
| b/invitations/invitations.py | ||
|---|---|---|
| 49 | 49 |
from synnefo.logic.email_send import send_async, send |
| 50 | 50 |
from synnefo.api.common import method_not_allowed |
| 51 | 51 |
from synnefo.db.models import Invitations, SynnefoUser |
| 52 |
from synnefo.logic import users, log |
|
| 52 |
from synnefo.logic import users |
|
| 53 |
from synnefo.util.log import getLogger |
|
| 53 | 54 |
|
| 54 | 55 |
from Crypto.Cipher import AES |
| 55 | 56 |
|
| 56 |
_logger = log.get_logger("synnefo.invitations")
|
|
| 57 |
log = getLogger('synnefo.invitations')
|
|
| 57 | 58 |
|
| 58 | 59 |
|
| 59 | 60 |
def process_form(request): |
| ... | ... | |
| 81 | 82 |
(name, email, e.messages[0])] |
| 82 | 83 |
except Exception as e: |
| 83 | 84 |
remove_invitation(invitation) |
| 84 |
_logger.exception(e)
|
|
| 85 |
log.exception(e)
|
|
| 85 | 86 |
errors += ["Invitation to %s <%s> could not be sent. An unexpected" |
| 86 | 87 |
" error occurred. Please try again later." % |
| 87 | 88 |
(name, email)] |
| ... | ... | |
| 97 | 98 |
get_invitations_left(request.user)}, |
| 98 | 99 |
context_instance=RequestContext(request)) |
| 99 | 100 |
response = HttpResponse(data) |
| 100 |
_logger.warn("Error adding invitation %s -> %s: %s" %
|
|
| 101 |
(request.user.uniq, email, errors))
|
|
| 101 |
log.warn("Error adding invitation %s -> %s: %s",
|
|
| 102 |
request.user.uniq, email, errors)
|
|
| 102 | 103 |
else: |
| 103 | 104 |
# form submitted |
| 104 | 105 |
data = render_to_string('invitations.html',
|
| ... | ... | |
| 108 | 109 |
get_invitations_left(request.user)}, |
| 109 | 110 |
context_instance=RequestContext(request)) |
| 110 | 111 |
response = HttpResponse(data) |
| 111 |
_logger.info("Added invitation %s -> %s" % (request.user.uniq, email))
|
|
| 112 |
log.info("Added invitation %s -> %s", request.user.uniq, email)
|
|
| 112 | 113 |
|
| 113 | 114 |
return response |
| 114 | 115 |
|
| ... | ... | |
| 214 | 215 |
inv.accepted = True |
| 215 | 216 |
inv.save() |
| 216 | 217 |
|
| 217 |
_logger.info("Invited user %s logged in", inv.target.uniq)
|
|
| 218 |
log.info("Invited user %s logged in", inv.target.uniq)
|
|
| 218 | 219 |
|
| 219 | 220 |
data = dict() |
| 220 | 221 |
data['user'] = user.realname |
| ... | ... | |
| 255 | 256 |
|
| 256 | 257 |
data = render_to_string('invitation.txt', {'email': email})
|
| 257 | 258 |
|
| 258 |
_logger.debug("Invitation URL: %s" % email['url'])
|
|
| 259 |
log.debug("Invitation URL: %s", email['url'])
|
|
| 259 | 260 |
|
| 260 | 261 |
# send_async( |
| 261 | 262 |
# frm = "%s"%(settings.DEFAULT_FROM_EMAIL), |
| ... | ... | |
| 310 | 311 |
try: |
| 311 | 312 |
send_invitation(inv) |
| 312 | 313 |
except Exception as e: |
| 313 |
_logger.exception(e)
|
|
| 314 |
log.exception(e)
|
|
| 314 | 315 |
return HttpResponseServerError("Error sending invitation email")
|
| 315 | 316 |
|
| 316 | 317 |
return HttpResponse("Invitation has been resent")
|
Also available in: Unified diff