Changeset 190 for trunk/daemon

Timestamp:

08/08/05 16:05:31 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Fix: don't save node info from jobs in Q state
• Fix: save node info on update

File:

• trunk/daemon/togad.py (modified) (2 diffs)

trunk/daemon/togad.py

@@ -237 +237 @@
                         elif valname == 'nodes' and value:
 
-                                ids = self.addNodes( value, jobattrs['domain'] )
+                                node_invalid = 0
+
+                                if len(value) == 1:
+                                
+                                        for node_char in str(value[0]):
+
+                                                if string.find( string.digits, node_char ) == -1:
+
+                                                        node_invalid = 1
+
+                                if not node_invalid:
+
+                                        ids = self.addNodes( value, jobattrs['domain'] )
+
+                                else:
+                                        ids = [ ]
+
                                 node_list = value
 
@@ -250 +266 @@
 
                         self.setDatabase( "UPDATE jobs SET %s WHERE job_id=%s" %(update_str, job_id) )
+
+                        if len( ids ) > 0:
+                                self.addJobNodes( job_id, ids )
 
         def addNodes( self, hostnames, domain ):