Move exception handling in get_user()

snf-cyclades-app/synnefo/api/management/commands/server-list.py

@@ -132,10 +132,7 @@ class Command(BaseCommand):
 
             user = server.userid
             if not options['use_uuids']:
-                try:
-                    user = ucache.get_user(server.userid)
-                except:
-                    pass
+                user = ucache.get_user(server.userid)
 
             fields = (str(server.id), name, user, flavor, image,
                       state, str(server.backend))

snf-cyclades-app/synnefo/management/common.py

@@ -263,15 +263,26 @@ def pprint_table(out, table, headers=None, separator=None):
 
 
 class UUIDCache(object):
+    """UUUID-to-email cache
+
+    """
+
+    astakos_url = ASTAKOS_URL.replace("im/authenticate",
+                                      "service/api/user_catalogs")
+
     def __init__(self):
         self.users = {}
 
     def get_user(self, uuid):
+        """Do the uuid-to-email resolving
+        """
+
         if not uuid in self.users:
-            astakos_url = ASTAKOS_URL.replace("im/authenticate",
-                                              "service/api/user_catalogs")
-            self.users[uuid] = \
-            astakos.get_displayname(token=CYCLADES_ASTAKOS_SERVICE_TOKEN,
-                                    url=astakos_url, uuid=uuid)
+            try:
+                self.users[uuid] = \
+                astakos.get_displayname(token=CYCLADES_ASTAKOS_SERVICE_TOKEN,
+                                        url=UUIDCache.astakos_url, uuid=uuid)
+            except Exception:
+                return uuid
 
         return self.users[uuid]