[rhmessaging-commits] rhmessaging commits: r2595 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-10-06 09:06:36 -0400 (Mon, 06 Oct 2008)
New Revision: 2595

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
Log:
Trap possible exceptions when getting jobads if we are disconnected from the broker.

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2008-10-06 13:03:22 UTC (rev 2594)
+++ mgmt/trunk/cumin/python/cumin/job.py	2008-10-06 13:06:36 UTC (rev 2595)
@@ -529,7 +529,7 @@
         return items
 
     def get_raw_ads(self, session, job):
-        self.job_ads = dict()
+        self.job_ads = {"":{"VALUE": "", "TYPE": 0}}
         self.got_data = False
         
         def completion(status, job_ads):
@@ -539,14 +539,14 @@
         def predicate():
             return self.got_data
         
-        model = self.app.model
-        job.GetAd(model.data, completion, self.job_ads)
+        try:
+            model = self.app.model
+            job.GetAd(model.data, completion, self.job_ads)
+        except:
+            return self.job_ads
         
         # wait for up to 20 seconds for completion to be called
-        succeeded = wait(predicate, timeout=20)
-        if not succeeded:
-            self.job_ads = {"":{"VALUE": "", "TYPE": 0}}
-        
+        wait(predicate, timeout=20)
         return self.job_ads
     
     def gen_items(self, session, job):