From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 13 Jan 2011 21:11:10 +0000 (-0500)
Subject: added 'lenient' argument to get_results()
X-Git-Tag: sfa-1.0-12~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9cd854c4ef86e4f63b418e2032cfa0146e28e75;p=sfa.git

added 'lenient' argument to get_results()
---

diff --git a/sfa/util/threadmanager.py b/sfa/util/threadmanager.py
index 3ec415f7..331f847f 100755
--- a/sfa/util/threadmanager.py
+++ b/sfa/util/threadmanager.py
@@ -50,13 +50,21 @@ class ThreadManager:
         for thread in self.threads:
             thread.join()
 
-    def get_results(self):
+    def get_results(self, lenient=True):
         """
         Return a list of all the results so far. Blocks until 
         all threads are finished. 
+        If lienent is set to false the error queue will be checked before 
+        the response is returned. If there are errors in the queue an SFA Fault will 
+        be raised.   
         """
         self.join()
         results = []
+        if not lenient:
+            errors = self.get_errors()
+            if errors: 
+                raise Exception(errors[0])
+
         while not self.results.empty():
             results.append(self.results.get())  
         return results
@@ -70,6 +78,12 @@ class ThreadManager:
         while not self.errors.empty():
             errors.append(self.errors.get())
         return errors
+
+    def get_return_value(self):
+        """
+        Get the value that should be returuned to the client. If there are errors then the
+        first error is returned. If there are no errors, then the first result is returned  
+        """
     
            
 if __name__ == '__main__':
@@ -94,7 +108,9 @@ if __name__ == '__main__':
     threads.run(f, "Thread2", -10, 1)
     threads.run(e, "Thread3", 19, 1)
 
-    results = threads.get_results()
-    errors = threads.get_errors()
-    print "Results:", results
-    print "Errors:", errors
+    #results = threads.get_results()
+    #errors = threads.get_errors()
+    #print "Results:", results
+    #print "Errors:", errors
+    results_xlenient = threads.get_results(lenient=False)
+