Revision d59f5608 snf-astakos-app/astakos/im/models.py
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 126 | 126 |
self.auth_token_expires = expiration_date |
| 127 | 127 |
else: |
| 128 | 128 |
self.auth_token_expires = None |
| 129 |
msg = 'Token renewed for component %s' % self.name
|
|
| 130 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 129 |
msg = 'Token renewed for component %s' |
|
| 130 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, self.name)
|
|
| 131 | 131 |
|
| 132 | 132 |
def __str__(self): |
| 133 | 133 |
return self.name |
| ... | ... | |
| 554 | 554 |
timedelta(hours=astakos_settings.AUTH_TOKEN_DURATION) |
| 555 | 555 |
if flush_sessions: |
| 556 | 556 |
self.flush_sessions(current_key) |
| 557 |
msg = 'Token renewed for %s' % self.log_display
|
|
| 558 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 557 |
msg = 'Token renewed for %s' |
|
| 558 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, self.log_display)
|
|
| 559 | 559 |
|
| 560 | 560 |
def token_expired(self): |
| 561 | 561 |
return self.auth_token_expires < datetime.now() |
| ... | ... | |
| 567 | 567 |
|
| 568 | 568 |
keys = q.values_list('session_key', flat=True)
|
| 569 | 569 |
if keys: |
| 570 |
msg = 'Flushing sessions: %s' % ','.join(keys)
|
|
| 571 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, [])
|
|
| 570 |
msg = 'Flushing sessions: %s' |
|
| 571 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, ','.join(keys))
|
|
| 572 | 572 |
engine = import_module(settings.SESSION_ENGINE) |
| 573 | 573 |
for k in keys: |
| 574 | 574 |
s = engine.SessionStore(k) |
| ... | ... | |
| 1116 | 1116 |
user.email = email_change.new_email_address |
| 1117 | 1117 |
user.save() |
| 1118 | 1118 |
email_change.delete() |
| 1119 |
msg = "User %s changed email from %s to %s" % (user.log_display, |
|
| 1120 |
old_email, |
|
| 1121 |
user.email) |
|
| 1122 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 1119 |
msg = "User %s changed email from %s to %s" |
|
| 1120 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, user.log_display, old_email, user.email) |
|
| 1123 | 1121 |
return user |
| 1124 | 1122 |
except EmailChange.DoesNotExist: |
| 1125 | 1123 |
raise ValueError(_('Invalid activation key.'))
|
Also available in: Unified diff