[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[jparsons at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-10-12 22:11:31

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	fixups to busy stuff

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.107&r2=1.108

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/12 21:00:49	1.107
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/12 22:11:30	1.108
@@ -2258,6 +2258,7 @@
   ##check for error...if error, report and then remove flag.
   ##if no error, check if complete. If not complete, report status
   ##If complete, report status and remove flag.
+
   for item in items:
     tasktype = item[1].getProperty(TASKTYPE)
     if tasktype == CLUSTER_ADD or tasktype == NODE_ADD:
@@ -2265,13 +2266,17 @@
       node_report['isnodecreation'] = True
       node_report['iserror'] = False  #Default value
       node_report['desc'] = item[1].getProperty(FLAG_DESC) 
+      batch_xml = None
       ricci = item[0].split("____") #This removes the 'flag' suffix
       try:
         rc = RicciCommunicator(ricci[0])
+        batch_xml = rc.batch_report(item[1].getProperty(BATCH_ID))
+        if batch_xml != None:
+          (creation_status, total) = batch_status(batch_xml)
       except:
         creation_status = RICCI_CONNECT_FAILURE  #No contact with ricci (-1000)
+        batch_xml = "bloody_failure" #set to avoid next if statement
 
-      batch_xml = rc.batch_report(item[1].getProperty(BATCH_ID))
       if batch_xml == None:  #The job is done and gone from queue
         if redirect_message == False: #We have not displayed this message yet
           node_report['desc'] = REDIRECT_MSG
@@ -2282,7 +2287,7 @@
         clusterfolder.manage_delObjects(item[0])
         continue
 
-      (creation_status, total) = batch_status(batch_xml)
+
 
       if creation_status < 0:  #an error was encountered
         if creation_status == RICCI_CONNECT_FAILURE: