Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16460 from edx/noraiz/remove-logs-EDUCATOR-1652

Browse Source 
remove logs added under EDUCATOR-1652
This commit is contained in:
Noraiz Anwar
2017-11-06 21:04:59 +05:00
committed by GitHub
parent 0255592c67 1f99e28f57
commit a69fb493c3
1 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
cms/djangoapps/contentstore/views/course.py
View File

@@ -468,9 +468,7 @@ def _accessible_courses_list_from_groups(request):
course_keys = course_keys.values()
if course_keys:
start_time = time.time()
courses_list = modulestore().get_course_summaries(course_keys=course_keys)
log.info('[%d] Course summaries fetched in [%f]', len(courses_list), (time.time() - start_time))
return courses_list, []
@@ -497,26 +495,14 @@ def course_listing(request):
"""
List all courses available to the logged in user
"""
def _execute_method_and_log_time(func, *args):
"""
Call func passed in method with logging the time it took to complete.
Logging is temporary, we will remove this once we get required information.
"""
start_time = time.time()
output = func(*args)
log.info('[%s] completed in [%f]', func.__name__, (time.time() - start_time))
return output
optimization_enabled = GlobalStaff().has_user(request.user) and \
WaffleSwitchNamespace(name=WAFFLE_NAMESPACE).is_enabled(u'enable_global_staff_optimization')
org = request.GET.get('org', '') if optimization_enabled else None
courses_iter, in_process_course_actions = _execute_method_and_log_time(get_courses_accessible_to_user, request, org)
courses_iter, in_process_course_actions = get_courses_accessible_to_user(request, org)
user = request.user
libraries = []
if LIBRARIES_ENABLED:
libraries = _execute_method_and_log_time(_accessible_libraries_iter, request.user, org)
libraries = _accessible_libraries_iter(request.user, org) if LIBRARIES_ENABLED else []
def format_in_process_course_view(uca):
"""
@@ -553,33 +539,24 @@ def course_listing(request):
}
split_archived = settings.FEATURES.get(u'ENABLE_SEPARATE_ARCHIVED_COURSES', False)
active_courses, archived_courses = _execute_method_and_log_time(
_process_courses_list,
courses_iter,
in_process_course_actions,
split_archived
)
active_courses, archived_courses = _process_courses_list(courses_iter, in_process_course_actions, split_archived)
in_process_course_actions = [format_in_process_course_view(uca) for uca in in_process_course_actions]
response = _execute_method_and_log_time(
render_to_response,
u'index.html',
{
u'courses': active_courses,
u'archived_courses': archived_courses,
u'in_process_course_actions': in_process_course_actions,
u'libraries_enabled': LIBRARIES_ENABLED,
u'libraries': [format_library_for_view(lib) for lib in libraries],
u'show_new_library_button': get_library_creator_status(user),
u'user': user,
u'request_course_creator_url': reverse('request_course_creator'),
u'course_creator_status': _get_course_creator_status(user),
u'rerun_creator_status': GlobalStaff().has_user(user),
u'allow_unicode_course_id': settings.FEATURES.get(u'ALLOW_UNICODE_COURSE_ID', False),
u'allow_course_reruns': settings.FEATURES.get(u'ALLOW_COURSE_RERUNS', True),
u'optimization_enabled': optimization_enabled
}
)
return render_to_response(u'index.html', {
u'courses': active_courses,
u'archived_courses': archived_courses,
u'in_process_course_actions': in_process_course_actions,
u'libraries_enabled': LIBRARIES_ENABLED,
u'libraries': [format_library_for_view(lib) for lib in libraries],
u'show_new_library_button': get_library_creator_status(user),
u'user': user,
u'request_course_creator_url': reverse('request_course_creator'),
u'course_creator_status': _get_course_creator_status(user),
u'rerun_creator_status': GlobalStaff().has_user(user),
u'allow_unicode_course_id': settings.FEATURES.get(u'ALLOW_UNICODE_COURSE_ID', False),
u'allow_course_reruns': settings.FEATURES.get(u'ALLOW_COURSE_RERUNS', True),
u'optimization_enabled': optimization_enabled
})
return response