handle request Timeouts by sleeping 1 and then retrying

mozilla · Mar 6, 2014 · 981f78f · 981f78f
1 parent a3e9d4f
commit 981f78f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/slurpee/management/commands/scrape.py b/slurpee/management/commands/scrape.py
@@ -61,7 +61,8 @@ def handle(self, *sources, **opts):
                     )
                 except Exception, e:
                     write_alert(
-                        "Exception type: {0}. Error: ".format(type(e), str(e))
+                        "Exception type: {0}. Error: {1} ".format(
+                            type(e), str(e))
                     )
                     logging.error(
                         "Halting external data import due to: "

diff --git a/slurpee/puppet_slurp.py b/slurpee/puppet_slurp.py
@@ -66,9 +66,15 @@ def slurp(self):
         success = False
         # We have tried retry times
         while retry < MAX_RETRY:
-            self.resp = self.session.get(
-                self.fact_url, params=self.params, verify=self.ssl_verify
-            )
+            try:
+                self.resp = self.session.get(
+                    self.fact_url, params=self.params, verify=self.ssl_verify
+                )
+            except requests.exceptions.Timeout:
+                time.sleep(1)
+                retry += 1
+                continue
+
             if self.resp.status_code == 200:
                 self.data = json.loads(self.resp.content)
                 success = True