From b41402ef263e89745bcde393e12fe0e8f062f853 Mon Sep 17 00:00:00 2001 From: Trygve Vea Date: Thu, 23 Nov 2017 20:37:00 +0000 Subject: [PATCH] Add user_domain_name to logs regarding authentication The user domain name is useful information when troubleshooting authentication in OpenStack-installations with multiple domains. Change-Id: I1cecd36bfafd7bdf9a9c68d2311fa5ff96272f36 --- openstack_auth/forms.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py index 107fb191c5..a7baeeae8e 100644 --- a/openstack_auth/forms.py +++ b/openstack_auth/forms.py @@ -136,19 +136,15 @@ class Login(django_auth_forms.AuthenticationForm): password=password, user_domain_name=domain, auth_url=region) - msg = 'Login successful for user "%(username)s", remote address '\ - '%(remote_ip)s.' % { - 'username': username, - 'remote_ip': utils.get_client_ip(self.request) - } - LOG.info(msg) + LOG.info('Login successful for user "%(username)s" using domain ' + '"%(domain)s", remote address %(remote_ip)s.', + {'username': username, 'domain': domain, + 'remote_ip': utils.get_client_ip(self.request)}) except exceptions.KeystoneAuthException as exc: - msg = 'Login failed for user "%(username)s", remote address '\ - '%(remote_ip)s.' % { - 'username': username, - 'remote_ip': utils.get_client_ip(self.request) - } - LOG.warning(msg) + LOG.info('Login failed for user "%(username)s" using domain ' + '"%(domain)s", remote address %(remote_ip)s.', + {'username': username, 'domain': domain, + 'remote_ip': utils.get_client_ip(self.request)}) raise forms.ValidationError(exc) if hasattr(self, 'check_for_test_cookie'): # Dropped in django 1.7 self.check_for_test_cookie()