Merge pull request #39 from linhuacheng/patch-11

Add username on the log for logout and rescope.

1 files changed, 9 insertions, 3 deletions

diff --git a/openstack_auth/views.py b/openstack_auth/views.py
index 63e6b03..8d3e7d8 100644
--- a/openstack_auth/views.py
+++ b/openstack_auth/views.py
@@ -71,7 +71,9 @@ def login(request):
 
 
 def logout(request):
-    LOG.info('User logging out.')
+    msg = 'Logging out user "%(username)s".' % \
+        {'username': request.user.username}
+    LOG.info(msg)
     if 'token_list' in request.session:
         t = Thread(target=delete_all_tokens,
                    args=(list(request.session['token_list']),))
@@ -106,9 +108,13 @@ def switch(request, tenant_id, redirect_field_name=REDIRECT_FIELD_NAME):
     try:
         token = client.tokens.authenticate(tenant_id=tenant_id,
                                         token=request.user.token.id)
-        LOG.info('Token rescoping successful.')
+        msg = 'Tenant switch successful for user "%(username)s".' % \
+            {'username': request.user.username}
+        LOG.info(msg)
     except keystone_exceptions.ClientException:
-        LOG.warning('Token rescoping failed.')
+        msg = 'Tenant switch failed for user "%(username)s".' % \
+            {'username': request.user.username}
+        LOG.warning(msg)
         token = None
         LOG.exception('An error occurred while switching sessions.')