Changeset 75

Timestamp:

04/15/05 11:56:55 (18 years ago)

Author:

bastiaans

Message:

plugin/togap.py:

• Misc fixes for compatibility with toga daemon

File:

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

trunk/plugin/togap.py

@@ -40 +40 @@
                         self.binary = binary
 
-                self.dmax = TORQUE_POLL_INTERVAL
+                self.tmax = str( TORQUE_POLL_INTERVAL )
 
                 try:
@@ -92 +92 @@
                 return incompatible
 
-        def multicastGmetric( self, metricname, metricval, valtype='string', tmax='15' ):
+        def multicastGmetric( self, metricname, metricval, valtype='string' ):
                 """Call gmetric binary and multicast"""
 
@@ -102 +102 @@
                         debug_msg( 10, 'Assuming /etc/gmond.conf for gmetric cmd (ommitting)' )
 
-                cmd = cmd + ' -n' + metricname + ' -v"' + metricval + '" -t' + valtype + ' -x' + tmax + ' -d' + str( self.dmax )
+                cmd = cmd + ' -n' + str( metricname )+ ' -v"' + str( metricval )+ '" -t' + str( valtype ) + ' -x' + str( self.tmax )
 
                 print cmd
@@ -198 +198 @@
                         myAttrs['status'] = status
                         myAttrs['start_timestamp'] = start_timestamp
-                        myAttrs['reported_timestamp'] = str( int( self.cur_time ) )
+                        myAttrs['reported'] = str( int( self.cur_time ) )
                         myAttrs['nodes'] = nodeslist
                         myAttrs['domain'] = string.join( socket.getfqdn().split( '.' )[1:], '.' )
@@ -244 +244 @@
                 queue_str = 'queue=' + jobattrs['queue']
                 owner_str = 'owner=' + jobattrs['owner']
-                rtime_str = 'rtime=' + jobattrs['requested_time']
-                rmem_str = 'rmem=' + jobattrs['requested_memory']
+                rtime_str = 'requested_time=' + jobattrs['requested_time']
+                rmem_str = 'requested_memory=' + jobattrs['requested_memory']
                 ppn_str = 'ppn=' + jobattrs['ppn']
                 status_str = 'status=' + jobattrs['status']
-                stime_str = 'stime=' + jobattrs['start_timestamp']
-                reported_str = 'reported=' + jobattrs['reported_timestamp']
+                stime_str = 'start_timestamp=' + jobattrs['start_timestamp']
+                reported_str = 'reported=' + jobattrs['reported']
                 domain_str = 'domain=' + jobattrs['domain']
                 node_str = 'nodes=' + self.makeNodeString( jobattrs['nodes'] )