Merge pull request #27 from uw-it-aca/develop

Develop
uw-it-aca · Dec 8, 2020 · 7cd18de · 7cd18de
2 parents 95bf294 + ba9fc0f
commit 7cd18de
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/analytics/report_builder.py b/analytics/report_builder.py
@@ -15,7 +15,7 @@
 
 RETRY_STATUS_CODES = [0, 408, 500, 502, 503, 504]
 RETRY_MAX = 5
-RETRY_DELAY = 3
+RETRY_DELAY = 5
 
 
 class ReportBuilder():
@@ -86,12 +86,18 @@ def build_subaccount_activity_report(self, root_account_id, sis_term_id):
 
                 setattr(activity, key, val)
 
-            data = self.get_activity_by_account(sis_account_id, sis_term_id)
+            try:
+                data = self.get_activity_by_account(sis_account_id,
+                                                    sis_term_id)
+
+                for item in data["by_category"]:
+                    setattr(activity,
+                            "{}_views".format(item["category"]),
+                            item["views"])
 
-            for item in data["by_category"]:
-                setattr(activity,
-                        "{}_views".format(item["category"]),
-                        item["views"])
+            except DataFailureException as ex:
+                if ex.status != 504:
+                    raise
 
             activity.save()