From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 16 Jan 2015 11:24:29 +0000 (+0100)
Subject: myplc: in try except to avoid errors if PLE is down
X-Git-Tag: myslice-1.3~117^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=43495196f25615162145ae3642c648a5c849ad5d;p=myslice.git

myplc: in try except to avoid errors if PLE is down
---

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index 533cccfa..4424c2e5 100644
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -29,12 +29,16 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         if pending_authorities:
             return False                        
         pending_user_email = pending_user.email
-        query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
-        results = execute_admin_query(self.request, query)
-        for result in results:
-            # User is enabled in PLE
-            if 'enabled' in result and result['enabled']==True:
-                return True
+        try:
+            query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
+            results = execute_admin_query(self.request, query)
+            for result in results:
+                # User is enabled in PLE
+                if 'enabled' in result and result['enabled']==True:
+                    return True
+        except Exception, e:
+            print "Exception in myplc query = ",e
+
         return False
 
     def dispatch(self, *args, **kwargs):