Changeset 87e262c in indico

Timestamp:

02/25/10 18:28:26 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

37e743

Parents:

e7aa6b

git-author:

Jose Benito <jose.benito.gonzalez@…> (02/25/10 18:00:41)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/25/10 18:28:26)

Message:

[FIX] catching timing errors as warnings

Location:

indico/MaKaC/services

Files:

• implementation/schedule.py (modified) (2 diffs)
• interface/rpc/common.py (modified) (8 diffs)
• interface/rpc/json.py (modified) (1 diff)

indico/MaKaC/services/implementation/schedule.py

@@ -10 +10 @@
 from MaKaC.common.PickleJar import DictPickler
 
-from MaKaC.services.interface.rpc.common import ServiceError
+from MaKaC.services.interface.rpc.common import ServiceError, TimingNoReportError
 
 from MaKaC.services.implementation import conference as conferenceServices
@@ -79 +79 @@
             return self._performOperation()
         except TimingError, e:
-            raise ServiceError("ERR-E2", e.getMsg())
+            raise TimingNoReportError("ERR-E2", e.getMsg())
 
     def initializeAutoOps(self):

indico/MaKaC/services/interface/rpc/common.py

@@ -18 +18 @@
                 'MaKaC.services.interface.rpc.common.HTMLSecurityError',
                 'MaKaC.services.interface.rpc.common.ServiceAccessError',
+                'MaKaC.services.interface.rpc.common.TimingNoReportError',
                 'MaKaC.services.implementation.base.ExpectedParameterException',
                 'MaKaC.services.implementation.base.EmptyParameterException',
@@ -35 +36 @@
                 'MaKaC.services.interface.rpc.common.HTMLSecurityError',
                 'MaKaC.services.interface.rpc.common.ServiceAccessError',
+                'MaKaC.services.interface.rpc.common.TimingNoReportError',
                 'MaKaC.services.implementation.base.ExpectedParameterException',
                 'MaKaC.services.implementation.base.EmptyParameterException',
@@ -52 +54 @@
                 'MaKaC.services.interface.rpc.common.HTMLSecurityError',
                 'MaKaC.services.interface.rpc.common.ServiceAccessError',
+                'MaKaC.services.interface.rpc.common.TimingNoReportError',
                 'MaKaC.services.implementation.base.ExpectedParameterException',
                 'MaKaC.services.implementation.base.EmptyParameterException',
@@ -60 +63 @@
     def getInner(self):
         return self.inner
-    
+
     @Retrieves(['MaKaC.services.interface.rpc.common.CausedError',
                 'MaKaC.services.interface.rpc.common.NoReportError',
@@ -69 +72 @@
                 'MaKaC.services.interface.rpc.common.HTMLSecurityError',
                 'MaKaC.services.interface.rpc.common.ServiceAccessError',
+                'MaKaC.services.interface.rpc.common.TimingNoReportError',
                 'MaKaC.services.implementation.base.ExpectedParameterException',
                 'MaKaC.services.implementation.base.EmptyParameterException',
@@ -87 +91 @@
                 inner = self.inner
             return "%s : %s\r\n\r\nInner Exception:\r\n%s" % (self.code, self.message, inner)
-    
+
 class NoReportError(CausedError):
-    
+
     def __init__(self, code, message, inner=None):
         CausedError.__init__(self, code, message, inner, "noReport")
@@ -97 +101 @@
 
 class ProcessError(CausedError):
-    
+
     def __init__(self, code, message):
         CausedError.__init__(self, code, message, inner = traceback.format_exception(*sys.exc_info()))
@@ -113 +117 @@
     pass
 
+class TimingNoReportError(NoReportError):
+    pass
+
 
 class Warning(object):
-    
+
     def __init__(self, title, content):
         self._title = title
         self._content = content
-    
+
     @Retrieves(['MaKaC.services.interface.rpc.common.Warning'], 'title')
     def getTitle(self):
         return self._title
-    
+
     @Retrieves(['MaKaC.services.interface.rpc.common.Warning'], 'content')
     def getProblems(self):
         return self._content
-    
+
 class ResultWithWarning(object):
-    
+
     def __init__(self, result, warning):
         self._result = result
         self._warning = warning
-        
+
     @Retrieves(['MaKaC.services.interface.rpc.common.ResultWithWarning'], 'result', isPicklableObject = True)
     def getResult(self):
         return self._result
-    
+
     @Retrieves(['MaKaC.services.interface.rpc.common.ResultWithWarning'], 'warning', isPicklableObject = True)
     def getWarning(self):
         return self._warning
-    
+
     @Retrieves(['MaKaC.services.interface.rpc.common.ResultWithWarning'], 'hasWarning')
     def hasWarning(self):

indico/MaKaC/services/interface/rpc/json.py

@@ -117 +117 @@
     except CausedError, e:
 
-        errorInfo = DictPickler.pickle(e);
+        try:
+            errorInfo = DictPickler.pickle(e);
+        except Exception, e2:
+            # This is to catch Exceptions that are not registered as Pickles.
+            errorInfo  = {'code':'', 'message': str(e)}
+            Logger.get('dev').exception('Exception not registered as pickle')
+
 
         if isinstance(e, NoReportError):