Changeset 95 for trunk/plugin

Timestamp:

04/20/05 10:15:37 (18 years ago)

Author:

bastiaans

Message:

plugin/togap.py:

• Made sure no empty variabeles are transmitted

File:

• trunk/plugin/togap.py (modified) (4 diffs)

trunk/plugin/togap.py

@@ -186 +186 @@
                         requested_time = self.getAttr( attrs, 'Resource_List.walltime' )
                         requested_memory = self.getAttr( attrs, 'Resource_List.mem' )
+
                         mynoderequest = self.getAttr( attrs, 'Resource_List.nodes' )
+
                         if mynoderequest.find( ':' ) != -1 and mynoderequest.find( 'ppn' ) != -1:
                                 ppn = mynoderequest.split( ':' )[1].split( 'ppn=' )[1]
                         else:
                                 ppn = ''
+
                         status = self.getAttr( attrs, 'job_state' )
-                        start_timestamp = self.getAttr( attrs, 'mtime' )
-
-                        nodes = self.getAttr( attrs, 'exec_host' ).split( '+' )
+
+                        if status == 'R':
+                                start_timestamp = self.getAttr( attrs, 'mtime' )
+                                nodes = self.getAttr( attrs, 'exec_host' ).split( '+' )
+                        else:
+                                start_timestamp = ''
+                                nodes = [ ]
+
                         nodeslist = [ ]
 
@@ -220 +228 @@
                                 jobs[ job_id ] = myAttrs
 
-                                #self.printJob( jobs, job_id )
-
                                 debug_msg( 10, printTime() + ' job %s state changed' %(job_id) )
 
@@ -243 +249 @@
                 for jobid, jobattrs in jobs.items():
 
-                        if jobattrs['status'] in [ 'Q', 'R' ]:
-
-                                gmetric_val = self.compileGmetricVal( jobid, jobattrs )
-
-                                for val in gmetric_val:
-                                        self.dp.multicastGmetric( 'TOGA-JOB-' + jobid, val )
+                        gmetric_val = self.compileGmetricVal( jobid, jobattrs )
+
+                        for val in gmetric_val:
+                                self.dp.multicastGmetric( 'TOGA-JOB-' + jobid, val )
 
         def makeNodeString( self, nodelist ):
@@ -271 +275 @@
                 appendList.append( 'owner=' + jobattrs['owner'] )
                 appendList.append( 'requested_time=' + jobattrs['requested_time'] )
-                appendList.append( 'requested_memory=' + jobattrs['requested_memory'] )
-                appendList.append( 'ppn=' + jobattrs['ppn'] )
+
+                if jobattrs['requested_memory'] != '':
+                        appendList.append( 'requested_memory=' + jobattrs['requested_memory'] )
+
+                if jobattrs['ppn'] != '':
+                        appendList.append( 'ppn=' + jobattrs['ppn'] )
+
                 appendList.append( 'status=' + jobattrs['status'] )
-                appendList.append( 'start_timestamp=' + jobattrs['start_timestamp'] )
+
+                if jobattrs['start_timestamp'] != '':
+                        appendList.append( 'start_timestamp=' + jobattrs['start_timestamp'] )
+
                 appendList.append( 'reported=' + jobattrs['reported'] )
                 appendList.append( 'poll_interval=' + str( jobattrs['poll_interval'] ) )
                 appendList.append( 'domain=' + jobattrs['domain'] )
-                appendList.append( 'nodes=' + self.makeNodeString( jobattrs['nodes'] ) )
+
+                if len( jobattrs['nodes'] ) > 0:
+                        appendList.append( 'nodes=' + self.makeNodeString( jobattrs['nodes'] ) )
 
                 return self.makeAppendLists( appendList )