From 57444bdd253e428174c7a5475ef205063ac95ef3 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 23 Aug 2012 09:16:40 -0400 Subject: [PATCH 1/2] Make heartbeat url wait for courses to be loaded --- lms/djangoapps/heartbeat/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lms/djangoapps/heartbeat/views.py b/lms/djangoapps/heartbeat/views.py index 1d053d3da0..5ebd0b5cfa 100644 --- a/lms/djangoapps/heartbeat/views.py +++ b/lms/djangoapps/heartbeat/views.py @@ -1,6 +1,7 @@ import json from datetime import datetime from django.http import HttpResponse +from xmodule.modulestore.django import modulestore def heartbeat(request): @@ -8,6 +9,7 @@ def heartbeat(request): Simple view that a loadbalancer can check to verify that the app is up """ output = { - 'date': datetime.now().isoformat() + 'date': datetime.now().isoformat(), + 'courses': [course.location for course in modulestore().get_courses()], } return HttpResponse(json.dumps(output, indent=4)) From 5af67c1bf24768e5d2fe573198866af7d3e766de Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 23 Aug 2012 09:19:26 -0400 Subject: [PATCH 2/2] Put course location urls in heartbeat page, rather than lists --- lms/djangoapps/heartbeat/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/heartbeat/views.py b/lms/djangoapps/heartbeat/views.py index 5ebd0b5cfa..956504407b 100644 --- a/lms/djangoapps/heartbeat/views.py +++ b/lms/djangoapps/heartbeat/views.py @@ -10,6 +10,6 @@ def heartbeat(request): """ output = { 'date': datetime.now().isoformat(), - 'courses': [course.location for course in modulestore().get_courses()], + 'courses': [course.location.url() for course in modulestore().get_courses()], } return HttpResponse(json.dumps(output, indent=4))