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

Add better http error handling to award program certificate

Browse Source
This commit is contained in:
Brandon Baker
2018-08-01 14:58:52 -04:00
parent 4f8e8f1a23
commit 2f8c5af246
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openedx/core/djangoapps/programs/tasks/v1/tasks.py
View File

@@ -184,10 +184,7 @@ def award_program_certificates(self, username):
# client handles all 4XX errors the same way. In the future,
# we may want to fork slumber, add 429 handling, and use that
# in edx_rest_api_client.
# A status code looks like:
# "Client Error 429: http://example-endpoint/"
status_code = int(str(exc).split(':')[0][-3:])
if status_code == 429:
if exc.response.status_code == 429: # pylint: disable=no-member
rate_limit_countdown = 60
LOGGER.info(
"""Rate limited. Retrying task to award certificates to user {username} in {countdown}

22
openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py
View File

@@ -301,16 +301,18 @@ class AwardProgramCertificatesTestCase(CatalogIntegrationMixin, CredentialsApiCo
"""
Verify that a 429 error causes the task to fail and then retry.
"""
exception = exceptions.HttpClientError()
exception.response = mock.Mock(status_code=429)
mock_get_completed_programs.return_value = [1, 2]
mock_award_program_certificate.side_effect = self._make_side_effect(
[exceptions.HttpClientError('Client Error 429: http://example-endpoint/'), None]
[exception, None]
)
tasks.award_program_certificates.delay(self.student.username).get()
self.assertEqual(mock_award_program_certificate.call_count, 3)
def test_no_retry_oncredentials_api_404_error(
def test_no_retry_on_credentials_api_404_error(
self,
mock_get_completed_programs,
mock_get_certified_programs, # pylint: disable=unused-argument
@@ -319,25 +321,31 @@ class AwardProgramCertificatesTestCase(CatalogIntegrationMixin, CredentialsApiCo
"""
Verify that a 404 error causes the task to fail but there is no retry.
"""
exception = exceptions.HttpNotFoundError()
exception.response = mock.Mock(status_code=404)
mock_get_completed_programs.return_value = [1, 2]
mock_award_program_certificate.side_effect = self._make_side_effect(
[exceptions.HttpNotFoundError(), None]
[exception, None]
)
tasks.award_program_certificates.delay(self.student.username).get()
self.assertEqual(mock_award_program_certificate.call_count, 2)
def test_no_retry_on_credentials_api_not_found_errors(
def test_no_retry_on_credentials_api_4XX_error(
self,
mock_get_completed_programs,
mock_get_certified_programs,
mock_get_certified_programs, # pylint: disable=unused-argument
mock_award_program_certificate,
):
"""
Verify that other 4XX errors cause task to fail but there is no retry.
"""
exception = exceptions.HttpClientError()
exception.response = mock.Mock(status_code=418)
mock_get_completed_programs.return_value = [1, 2]
mock_get_certified_programs.side_effect = [[], [2]]
mock_award_program_certificate.side_effect = self._make_side_effect(
[exceptions.HttpClientError('Client Error 418: http://example-endpoint/'), None]
[exception, None]
)
tasks.award_program_certificates.delay(self.student.username).get()