Changeset 77

Timestamp:

04/15/05 12:28:58 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Misc bugfixes

File:

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

trunk/daemon/togad.py

@@ -187 +187 @@
                                         check_change = 1
 
-                                if not jobinfo.has_key( job_id ):
-                                        jobinfo[ job_id ] = { }
-
                                 valinfo = val.split( ' ' )
 
@@ -200 +197 @@
                                                 value = value.split( ';' )
 
-                                        jobinfo[ job_id ][ valname ] = value
+                                        jobinfo[ valname ] = value
 
                                 if check_change:
@@ -210 +207 @@
                                         debug_msg( 0, 'jobinfo for job %s has changed' %job_id )
                                         
-        def endElement( self, name, attrs ):
+        def endDocument( self ):
                 """When all metrics have gone, check if any jobs have finished"""
 
@@ -221 +218 @@
 
                                 self.jobAttrs[ jobid ]['status'] = 'F'
-                                self.jobAttrs[ jobid ]['stop_timestamp'] = self.heartbeat
+                                self.jobAttrs[ jobid ]['stop_timestamp'] = jobinfo['reported']
 
         def jobinfoChanged( self, jobattrs, jobid, jobinfo ):