Changeset 98 for trunk

Timestamp:

04/20/05 10:50:33 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Misc bugfix.
• Now entrys to 'job_nodes' table are created again

File:

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

trunk/daemon/togad.py

@@ -214 +214 @@
                         elif valname == 'nodes' and value:
 
-                                self.addNodes( value )
+                                ids = self.addNodes( value )
                                 node_list = value
 
@@ -220 +220 @@
 
                         self.setDatabase( "INSERT INTO jobs ( %s ) VALUES ( %s )" %( insert_col_str, insert_val_str ) )
-                        #ids = self.getNodeIds( node_list )
-
-                        #self.addJobNodes( job_id, ids )
+                        self.addJobNodes( job_id, ids )
+
                 elif action == 'update':
 
@@ -228 +227 @@
 
         def addNodes( self, hostnames ):
+
+                ids = [ ]
 
                 for node in hostnames:
@@ -235 +236 @@
                         if not id:
                                 self.setDatabase( "INSERT INTO nodes ( node_hostname ) VALUES ( '%s' )" %node )
+                                id = self.getNodeId( node )
+
+                        ids.append( id )
+
+                return ids
 
         def addJobNodes( self, jobid, nodes ):
@@ -393 +399 @@
 
         jobAttrs = { }
-        jobs_to_store = [ ]
 
         def __init__( self ):
 
                 self.ds = DataSQLStore( TOGA_SQL_DBASE.split( '/' )[0], TOGA_SQL_DBASE.split( '/' )[1] )
+                self.jobs_processed = [ ]
+                self.jobs_to_store = [ ]
 
         def startElement( self, name, attrs ):
@@ -409 +416 @@
                 
                 jobinfo = { }
-                self.jobs_processed = [ ]
 
                 if name == 'METRIC':