From: Andrew Flegg <andrew@bleb.org>
Date: Thu, 10 Jun 2010 13:40:24 +0000 (+0100)
Subject: Let other syncs continue in the event of a Twitter fail whale. Could be improved... 
X-Git-Tag: 0.8.1~1
X-Git-Url: https://vcs.maemo.org/git/?p=hermes;a=commitdiff_plain;h=2da91b93c4892bd02ad9c01f1b4f362065a02b00

Let other syncs continue in the event of a Twitter fail whale. Could be improved by adding a note somewhere user visible.
---

diff --git a/package/src/org/maemo/hermes/engine/twitter/service.py b/package/src/org/maemo/hermes/engine/twitter/service.py
index 7e01452..102acd9 100644
--- a/package/src/org/maemo/hermes/engine/twitter/service.py
+++ b/package/src/org/maemo/hermes/engine/twitter/service.py
@@ -78,7 +78,15 @@ class Service(org.maemo.hermes.engine.service.Service):
 
     # -----------------------------------------------------------------------
     def _get_tweeters(self):
-        return self._twitter.GetFriends()
+        try:
+            return self._twitter.GetFriends()
+        except urllib2.HTTPError, e:
+            if e.code >= 500 and e.code <= 599:
+                print "Twitter down (fail whale): " + e.message
+                return []
+            else:
+                raise e
+        
     
     
     # -----------------------------------------------------------------------