Fallback to fake video ids when LMS down

Author: thallada

analyticsdataserver/clients.py

@@ -1,5 +1,7 @@
 import logging
 
+from requests.exceptions import RequestException
+
 from edx_rest_api_client.client import EdxRestApiClient
 from edx_rest_api_client.exceptions import HttpClientError
 from opaque_keys.edx.keys import UsageKey
@@ -40,6 +42,9 @@ def all_videos(self, course_id):
             else:
                 logger.warning("Course Blocks API failed to return video ids (%s).", e.response.status_code)
             return None
+        except RequestException as e:
+            logger.warning("Course Blocks API request failed. Is the LMS running?: " + str(e))
+            return None
 
         # Setup a terrible hack to silence mysterious flood of ImportErrors from stevedore inside edx-opaque-keys.
         # (The UsageKey utility still works despite the import errors, so I think the errors are not important).

analyticsdataserver/tests.py

@@ -11,6 +11,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from rest_framework.authtoken.models import Token
+from requests.exceptions import ConnectionError
 
 from analytics_data_api.v0.models import CourseEnrollmentDaily, CourseEnrollmentByBirthYear
 from analyticsdataserver.clients import CourseBlocksApiClient
@@ -176,6 +177,15 @@ def test_all_videos_500(self, logger):
         logger.warning.assert_called_with('Course Blocks API failed to return video ids (%s).', 418)
         self.assertEqual(videos, None)
 
+    @responses.activate
+    @mock.patch('analyticsdataserver.clients.logger')
+    def test_all_videos_connection_error(self, logger):
+        exception = ConnectionError('LMS is dead')
+        responses.add(responses.GET, 'http://example.com/blocks/', body=exception)
+        videos = self.client.all_videos('course_id')
+        logger.warning.assert_called_with('Course Blocks API request failed. Is the LMS running?: ' + str(exception))
+        self.assertEqual(videos, None)
+
     @responses.activate
     def test_all_videos_pass_through_bad_id(self):
         responses.add(responses.GET, 'http://example.com/blocks/', body=json.dumps({'blocks': {