Changeset 7ede832 in sasview

Timestamp:

Dec 5, 2016 12:31:22 PM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

77910cf

Parents:

1c6bad0

Message:

Consolidate all errors into one while running calcthread.

File:

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

src/sas/sascalc/data_util/calcthread.py

@@ -255 +255 @@
         # thread when the queue is empty and start a new thread when
         # there is more work to be done.
+        errors = 0
         while 1:
             self._lock.acquire()
@@ -270 +271 @@
                 pass
             except:
-                self.exception()
+                errors += 1
+        if errors > 0:
+            self.exception()
         self._running = False