Changeset 73

Timestamp:

04/15/05 11:43:04 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Added check if info changed on a job

File:

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

trunk/daemon/togad.py

@@ -171 +171 @@
                 
                 heartbeat = 0
+                
+                jobinfo = { }
 
                 if name == 'METRIC':
@@ -184 +186 @@
                                 val = attrs.get( 'VAL', "" )
 
+                                check_change = 0
+
+                                if self.jobAttrs.has_key( job_id ):
+                                        check_change = 1
+
+                                if not jobinfo.has_key( job_id ):
+                                        jobinfo[ job_id ] = { }
+
                                 valinfo = val.split( ' ' )
-                                print valinfo
 
                                 for myval in valinfo:
@@ -195 +204 @@
                                                 value = value.split( ';' )
 
-                                        if not self.jobAttrs.has_key( job_id ):
-                                                self.jobAttrs[ job_id ] = { }
-
-                                        self.jobAttrs[ job_id ][ valname ] = value
-
-                print self.jobAttrs
+                                        jobinfo[ job_id ][ valname ] = value
+
+                                if check_change:
+                                        if self.jobinfoChanged( self.jobAttrs, job_id, jobinfo ):
+                                                self.jobAttrs[ job_id ] = jobinfo
+                                                debug_msg( 0, 'jobinfo for job %s has changed' %job_id )
+                                else:
+                                        self.jobAttrs[ job_id ] = jobinfo
+                                        debug_msg( 0, 'jobinfo for job %s has changed' %job_id )
+                                        
+
+        def jobinfoChanged( self, jobattrs, jobid, jobinfo ):
+
+                if jobattrs.has_key( jobid ):
+
+                        for valname, value in jobinfo.items():
+
+                                if jobattrs[ jobid ].has_key( valname ):
+
+                                        if value != jobattrs[ jobid ][ valname ]:
+
+                                                return 1
+
+                                else:
+                                        return 1
+
+                return 0
 
 class GangliaXMLHandler( xml.sax.handler.ContentHandler ):
@@ -413 +443 @@
                 self.myXMLGatherer = GangliaXMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
                 self.myXMLSource = self.myXMLGatherer.getFileObject()
+                self.myTXHandler = TorqueXMLHandler()
+                self.myXMLerror = XMLErrorHandler()
+
                 while( 1 ):
+
                         print 'parse'
                         self.myXMLGatherer.makeFileDescriptor()
                         self.myXMLSource = self.myXMLGatherer.getFileObject()
-                        xml.sax.parse( self.myXMLSource, TorqueXMLHandler(), XMLErrorHandler() )
+                        xml.sax.parse( self.myXMLSource, self.myTXHandler, self.myXMLerror )
+                        print self.myTXHandler.jobAttrs
                         print 'sleep'
                         time.sleep( 1 )
+
+                #self.myGXHandler = GangliaXMLHandler( self.config )
                 #self.myHandler = GangliaXMLHandler( self.config )
                 #self.myHandler = TorqueXMLHandler( )