Changeset 82 for trunk

Timestamp:

04/18/05 10:54:35 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• New jobinfo will now be appended to existing info, without losing old info because info can be spread out among misc. metric's for the same job

File:

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

trunk/daemon/togad.py

@@ -270 +270 @@
                                 if check_change:
                                         if self.jobinfoChanged( self.jobAttrs, job_id, jobinfo ):
-                                                self.jobAttrs[ job_id ] = jobinfo
+                                                self.jobAttrs[ job_id ] = self.setJobAttrs( self.jobAttrs[ job_id ], jobinfo )
                                                 debug_msg( 0, 'jobinfo for job %s has changed' %job_id )
                                 else:
@@ -289 +289 @@
                                 self.jobAttrs[ jobid ]['stop_timestamp'] = str( int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] ) )
 
+        def setJobAttrs( self, old, new ):
+                """
+                Set new job attributes in old, but not lose existing fields
+                if old attributes doesn't have those
+                """
+
+                for valname, value in new.items():
+                        old[ valname ] = value
+
+                return old
+                
+
         def jobinfoChanged( self, jobattrs, jobid, jobinfo ):
                 """