From 5b6e0514dee9e4878ea8026fbf4b482d28c5dc9f Mon Sep 17 00:00:00 2001 From: Zia Fazal Date: Mon, 11 Nov 2019 19:44:24 +0500 Subject: [PATCH] Added caller in to the exception message Added caller in to the exception message to debug ENT-1849 Replaced `get_enterprise_learner_data` method call with `enterprise_customer_for_request` to get enterprise customer data from cache or session instead of hitting API. --- lms/djangoapps/support/views/contact_us.py | 4 ++-- openedx/features/enterprise_support/api.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lms/djangoapps/support/views/contact_us.py b/lms/djangoapps/support/views/contact_us.py index 1b2f07c36a..a8ff65bf16 100644 --- a/lms/djangoapps/support/views/contact_us.py +++ b/lms/djangoapps/support/views/contact_us.py @@ -40,8 +40,8 @@ class ContactUsView(View): if request.user.is_authenticated: context['course_id'] = request.session.get('course_id', '') context['user_enrollments'] = CourseEnrollment.enrollments_for_user_with_overviews_preload(request.user) - enterprise_learner_data = enterprise_api.get_enterprise_learner_data(user=request.user) - if enterprise_learner_data: + enterprise_customer = enterprise_api.enterprise_customer_for_request(request) + if enterprise_customer: tags.append('enterprise_learner') context['tags'] = tags diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py index 73c2d77cb3..fe226277ae 100644 --- a/openedx/features/enterprise_support/api.py +++ b/openedx/features/enterprise_support/api.py @@ -5,6 +5,7 @@ from __future__ import absolute_import import logging from functools import wraps +import traceback from django.conf import settings from django.contrib.auth.models import User @@ -256,9 +257,10 @@ class EnterpriseApiClient(object): response = endpoint().get(**querystring) except (HttpClientError, HttpServerError): LOGGER.exception( - u'Failed to get enterprise-learner for user [%s] with client user [%s]', + u'Failed to get enterprise-learner for user [%s] with client user [%s]. Caller: %s', user.username, - self.user.username + self.user.username, + "".join(traceback.format_stack()) ) return None