Changeset 934ce649 in sasview for src/sas/sascalc/data_util

Timestamp:

May 23, 2016 4:48:46 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b6f563b4

Parents:

52b7fd9

Message:

make sure errors in compute get reported to user

File:

• src/sas/sascalc/data_util/calcthread.py (modified) (5 diffs)

src/sas/sascalc/data_util/calcthread.py

@@ -119 +119 @@
 
     def __init__(self, completefn=None, updatefn=None,
-                 yieldtime=0.01, worktime=0.01):
+                 yieldtime=0.01, worktime=0.01,
+                 exception_handler=None):
         """Prepare the calculator"""
         self.yieldtime     = yieldtime
@@ -125 +126 @@
         self.completefn    = completefn
         self.updatefn      = updatefn
+        self.exception_handler = exception_handler
         self._interrupting = False
         self._running      = False
@@ -199 +201 @@
 
     def update(self, **kwargs):
-
         """Update GUI with the lastest results from the current work unit."""
         if self.updatefn != None and clock() > self._time_for_update:
@@ -225 +226 @@
         """Perform a work unit.  The subclass will provide details of
         the arguments."""
-        raise NotImplemented, "Calculation thread needs compute method"
+        raise NotImplemented("Calculation thread needs compute method")
+
+    def exception(self):
+        """
+        An exception occurred during computation, so call the exception handler
+        if there is one.  If not, then log the exception and continue.
+        """
+        # If we have an exception handler, let it try to handle the exception.
+        # If it fails fall through to log the failure to handle the exception
+        # (the original exception will be lost).  If there is no exception
+        # handler, just log the exception in compute that we are responding to.
+        if self.exception_handler:
+            try:
+                self.exception_handler(*sys.exc_info())
+                return
+            except Exception:
+                pass
+        import logging
+        logging.error(traceback.format_exc())
+        #print 'CalcThread exception',
 
     def _run(self):
@@ -250 +270 @@
                 pass
             except:
-                traceback.print_exc()
-                #print 'CalcThread exception',
+                self.exception()
         self._running = False